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

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNextcloud bot <bot@nextcloud.com>2022-05-03 07:08:02 +0300
committerNextcloud bot <bot@nextcloud.com>2022-05-03 07:08:02 +0300
commitcfdc7385059d1d1aa3b3359062de5ed39d93745e (patch)
tree658595094a23e0b864b093e0408028470f6de286
parent80388308f5d75663fc2e2027bd53aedd02212b13 (diff)
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
-rw-r--r--.tx/nextcloud.client-desktop/de_translation8
-rw-r--r--translations/client_bg.ts539
-rw-r--r--translations/client_br.ts539
-rw-r--r--translations/client_ca.ts539
-rw-r--r--translations/client_cs.ts539
-rw-r--r--translations/client_da.ts539
-rw-r--r--translations/client_de.ts541
-rw-r--r--translations/client_el.ts539
-rw-r--r--translations/client_en_GB.ts539
-rw-r--r--translations/client_eo.ts539
-rw-r--r--translations/client_es.ts539
-rw-r--r--translations/client_es_AR.ts539
-rw-r--r--translations/client_es_CL.ts539
-rw-r--r--translations/client_es_CO.ts539
-rw-r--r--translations/client_es_CR.ts539
-rw-r--r--translations/client_es_DO.ts539
-rw-r--r--translations/client_es_EC.ts539
-rw-r--r--translations/client_es_GT.ts539
-rw-r--r--translations/client_es_HN.ts539
-rw-r--r--translations/client_es_MX.ts539
-rw-r--r--translations/client_es_SV.ts539
-rw-r--r--translations/client_et.ts539
-rw-r--r--translations/client_eu.ts539
-rw-r--r--translations/client_fa.ts539
-rw-r--r--translations/client_fi.ts539
-rw-r--r--translations/client_fr.ts539
-rw-r--r--translations/client_gl.ts539
-rw-r--r--translations/client_he.ts539
-rw-r--r--translations/client_hr.ts539
-rw-r--r--translations/client_hu.ts539
-rw-r--r--translations/client_id.ts539
-rw-r--r--translations/client_is.ts539
-rw-r--r--translations/client_it.ts539
-rw-r--r--translations/client_ja.ts539
-rw-r--r--translations/client_ko.ts539
-rw-r--r--translations/client_lt_LT.ts539
-rw-r--r--translations/client_lv.ts539
-rw-r--r--translations/client_mk.ts539
-rw-r--r--translations/client_nb_NO.ts539
-rw-r--r--translations/client_nl.ts539
-rw-r--r--translations/client_oc.ts539
-rw-r--r--translations/client_pl.ts539
-rw-r--r--translations/client_pt.ts539
-rw-r--r--translations/client_pt_BR.ts539
-rw-r--r--translations/client_ro.ts539
-rw-r--r--translations/client_ru.ts539
-rw-r--r--translations/client_sc.ts539
-rw-r--r--translations/client_sk.ts539
-rw-r--r--translations/client_sl.ts539
-rw-r--r--translations/client_sr.ts539
-rw-r--r--translations/client_sv.ts539
-rw-r--r--translations/client_th.ts539
-rw-r--r--translations/client_tr.ts539
-rw-r--r--translations/client_uk.ts539
-rw-r--r--translations/client_zh_CN.ts539
-rw-r--r--translations/client_zh_HK.ts539
-rw-r--r--translations/client_zh_TW.ts553
57 files changed, 16532 insertions, 13676 deletions
diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation
index 52903defb..79e8bb599 100644
--- a/.tx/nextcloud.client-desktop/de_translation
+++ b/.tx/nextcloud.client-desktop/de_translation
@@ -21,7 +21,7 @@ Icon=@APPLICATION_EXECUTABLE@
# Translations
-Icon[de_DE]=@APPLICATION_ICON_NAME@
-Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-GenericName[de_DE]=Ordnersynchronisierung
+Icon[de]=@APPLICATION_ICON_NAME@
+Name[de]=@APPLICATION_NAME@ Desktop
+Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
+GenericName[de]=Ordner-Synchronisation
diff --git a/translations/client_bg.ts b/translations/client_bg.ts
index 5c425ba74..fd467bbab 100644
--- a/translations/client_bg.ts
+++ b/translations/client_bg.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Отворяне %1 локално</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>В %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Отхвърляне</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Отваряне на диалоговия прозорец за споделяне</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Мнемонично криптиране от край до край</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>За да защитим вашата Криптографска идентичност, ние я криптираме мнемонично с 12 думи от речника. Моля, отбележете ги и ги пазете на сигурно място. Те ще са необходими, за да добавите други устройства към вашия профил (като вашия мобилен телефон или лаптоп).</translation>
</message>
@@ -734,47 +752,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Отписан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Без връзка</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Свързан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Услугата не е налична</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Режим на поддръжка</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Мрежова грешка</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Грешка с конфигурацията</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Въведете потребителска информация за вход</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Непознато състояние на профила</translation>
</message>
@@ -782,17 +800,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>За повече дейности, моля, отворете приложението Дейност.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Файловете от списъка за игнориране, както и символните връзки, не са синхронизирани.</translation>
</message>
@@ -853,42 +871,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Продължаването ще означава &lt;b&gt;изтриване на тези настройки&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Продължаването ще означава &lt;b&gt;игнориране на тези настройки&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Някои настройки са били конфигурирани в по-нови версии на този клиент и използват функции, които не са налични в тази версия.&lt;br&gt;&lt;br&gt;% 1&lt;br&gt;&lt;br&gt;Текущият конфигурационен файл вече е архивиран до% 2.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Напусни</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Продължи</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Грешка при опита за отваряне на конфигурационния файл</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Възникна грешка при достъпа до конфигурационния файл при % 1 . Моля да се уверите, че вашият потребител има достъп до файла.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Напускане %1</translation>
</message>
@@ -930,7 +948,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Файл %1 има невалиден час на промяна. Да не се качва на сървъра.</translation>
</message>
@@ -1203,8 +1220,8 @@ This action will abort any currently running synchronization.</source>
<translation>В отговора за откриване на сървърния файл липсват данни.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Грешка на сървъра: PROPFIND отговорът не е форматиран в XML!</translation>
</message>
@@ -1961,12 +1978,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Добавяне на папка за синхронизиране</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Добави</translation>
</message>
@@ -1984,7 +2001,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Въведете път до локалната папка.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Изберете папката източник</translation>
</message>
@@ -1992,7 +2009,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Създаване на отдалечена папка</translation>
</message>
@@ -2002,47 +2019,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Въведете име за новата папка, която ще бъде създадена в &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Въведете име за новата папка, която ще бъде създадена под „%1“:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Папката беше създадена успешно на %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Неуспешно удостоверяване при достъпа % 1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Неуспешно създаване на папката на % 1 . Моля, проверете ръчно.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation> Неуспешно вписване на папка в списък. Грешка:% 1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Синхронизирай целия профил</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Папката вече се синхронизира.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Вече синхронизирате &lt;i&gt;% 1&lt;/i&gt;, която е родителска папка от &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Вече синхронизирате &lt;i&gt;1%&lt;/i&gt;, която е подпапка от &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2050,24 +2067,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Използвайте виртуални файлове, вместо да изтегляте незабавно% 1 съдържание</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(експериментално)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Виртуалните файлове не се поддържат за основни дялове на Windows като локална папка. Моля, изберете валидна подпапка под буквата на устройството.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Не са налични виртуални файлове за избраната папка</translation>
</message>
@@ -2088,27 +2105,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Не е получен E-Tag от сървъра, проверете Proxy / Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Получихме различен E-Tag за възобновяване. Повторен опит следващия път.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Получихме неочаквано изтегляне, дължина на съдържанието..</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Сървърът върна грешен обхват на съдържание</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Грешка при свързване</translation>
</message>
@@ -2157,83 +2174,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Актуализации</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp; Автоматична проверка за Актуализации</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Канал</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>стабилен</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation> бета</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp; Рестартиране &amp;&amp; Актуализиране</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation> &amp;Проверете за Актуализация сега</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Допълнителни</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Изсквай потвърждение за синхронизиране на папки по-големи от</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Искане на потвърждение, преди да синхронизирате външни хранилища</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Показване на папки за синхронизиране в екрана за навигация на &amp;Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>&amp;Показване на докладчик за срив</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Игнорирани файлове</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Създаване на Архив за Отстраняване на грешки ...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Известия от сървъра, които изискват внимание.</translation>
</message>
@@ -2243,17 +2262,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Не можете да деактивирате автоматичното стартиране, защото е активирано автоматично стартиране в цялата система.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Промяна на канала за актуализация?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2262,32 +2281,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Обърнете внимание, че се избира само това от какво са взети надстройките на пула и че няма понижавания: Така че връщането от бета канала към стабилния канал обикновено не може да се направи веднага и означава изчакване на стабилна версия, която е по-нова от текущо инсталираната бета версия.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Промяна на канала за актуализация</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Отказ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Създаване на Архив за Отстраняване на грешки </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip Архиви</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Създаден е Архив за Отстраняване на грешки </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Архив за Отстраняване на грешки е създаден на %1</translation>
</message>
@@ -2648,7 +2667,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
@@ -2658,7 +2677,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Файл „% 1“&lt;br/&gt; не може да бъде отворен за записване.&lt;br/&gt;&lt;br/&gt; Изходът на регистрационния файл &lt;b&gt;не&lt;/b&gt; може да бъде записан!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Файл „% 1“&lt;br/&gt; не може да бъде отворен за записване.&lt;br/&gt;&lt;br/&gt; Изходът на регистрационния файл &lt;b&gt;не&lt;/b&gt; може да бъде записан!&lt;/nobr&gt;</translation>
</message>
@@ -3547,12 +3566,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Името на файла е в черния списък на сървъра.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Файлът има разширение, запазено за виртуални файлове.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>размер</translation>
</message>
@@ -3567,22 +3586,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>сървърът е отчел не % 1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>право</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>идентификатор на файла</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Сървърът е отчел не % 1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Не може да се синхронизира поради невалиден час на модификация</translation>
</message>
@@ -3592,47 +3611,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Конфликт при качване на някои файлове в папка. Тези, които са в конфликт, ще се изчистят!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Конфликт при качване на папка. Ще бъде изчистен!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Конфликт при качване на файл. Ще бъде премахнат!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Игнориран заради черния списък &apos;изберете какво да синхронизирате&apos;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Преместено в невалидна цел, възстановява се</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Не е позволено да се премахва, възстановява се</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Грешка при четене на базата данни</translation>
</message>
@@ -3642,7 +3661,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Сървърът отговори с грешка при четене на директория &apos;% 1&apos; : % 2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Сървърът отговори с грешка при четене на директория „%1“: %2</translation>
</message>
@@ -3683,44 +3702,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Файл % 1 не може да бъде изтеглен, защото липсва информация за криптиране.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Файл %1 не може да бъде изтеглен, защото липсва информация за криптиране.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Файлът се е променил след откриването</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Файл % 1 не може да бъде изтеглен поради сблъсък с името на локален файл!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Файл % 1 не може да бъде изтеглен поради сблъсък с името на локален файл!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Изтеглянето би намалило свободното място на локалния диск под ограничението</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Свободното място на диска е по-малко от %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Файлът беше изтрит от сървъра</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Целият файл не може да бъде свален.</translation>
</message>
@@ -3730,12 +3749,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Изтегленият файл е празен, въпреки че сървърът обяви, че е трябвало да бъде % 1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Изтегленият файл е празен, но сървърът обяви, че е трябвало да бъде % 1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл % 1 не може да бъде записан поради сблъсък с името на локален файл!</translation>
</message>
@@ -3745,18 +3764,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Грешка при записване на метаданни в базата данни</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Файл %1 има невалиден час на промяна, отчетен от сървъра. Не го записвайте.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Грешка при актуализиране на метаданни: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Файлът %1 в момента се използва</translation>
</message>
@@ -4143,7 +4162,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Отговор</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Отхвърли</translation>
</message>
@@ -4190,32 +4209,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Път на ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Икона</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation> споделяне на етикет</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Път в Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Папка: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Споделяне</translation>
</message>
@@ -4225,17 +4255,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Файлът не може да бъде споделен, защото е без право за споделяне.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Моля, въведете парола за споделяне на вашата връзка:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Нужна е парола за споделяне</translation>
</message>
@@ -4248,7 +4278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Парола:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Връзка за споделяне</translation>
</message>
@@ -4258,7 +4288,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Бележка:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Бележка</translation>
</message>
@@ -4273,7 +4303,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Дата на изтичане:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Задаване на парола</translation>
</message>
@@ -4283,7 +4313,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Изтича:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Изтича</translation>
</message>
@@ -4378,27 +4408,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Изтрий споделената връзка</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Потвърждава Изтриването на Споделяне на Връзки</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Наистина ли желаете да изтриете споделеното с публична връзка &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Бележка: Изтриването е необратима операция.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Изтрий</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Отказ</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Публична връзка</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Споделяне с потребители или групи...</translation>
</message>
@@ -4416,7 +4446,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Глобално търсене </translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Копирай връзката</translation>
</message>
@@ -4426,22 +4456,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Няма резултат за &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Няма резултати за „%1“</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Нужна е парола за споделяне</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Моля, въведете парола за споделяне на вашият имейл:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Споделих нещо с вас</translation>
</message>
@@ -4449,7 +4479,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Потребител</translation>
</message>
@@ -4459,62 +4489,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>може да редактира</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Може да редактира</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Бележка:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Парола:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Изтича:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Може да споделя повторно</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Бележка за получателя</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Задаване на дата на изтичане</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Прекратяване на споделяне</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Може да създава</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Може да променя</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Може да изтрива</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Защита с парола</translation>
</message>
@@ -4541,13 +4571,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Избор на ново местоположение ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Споделих нещо с вас</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Опции за споделяне</translation>
</message>
@@ -4557,79 +4587,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Сподели чрез %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Активност</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Копиране на частната връзката в клипборда</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Изпращане на частната връзката по имейл…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Повторното споделяне на този файл не е разрешено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Повторното споделяне на тази папка не е разрешено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Копиране на публична връзка</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Копиране на вътрешна връзка</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Редакция</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Отвори в браузъра</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Разрешаване на конфликт ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Преместване и преименуване</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Преместване, преименуване и качване ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Изтриване на местните промени</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Преместване и качване ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Изтриване</translation>
</message>
@@ -5205,29 +5256,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Добавяне на регистрация</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Отваряне на основния диалогов прозорец</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Пауза в синхронизирането</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Възобновяване на синхронизирането</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
@@ -5237,22 +5288,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/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Изход % 1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Пауза в синхронизирането за всички</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Възобновяване на синхронизирането за всички</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5260,24 +5311,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Клиент за настолен компютър&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Версия %1. За допълнителна информация, моля щракнете &lt;a href=&apos;%2&apos;&gt;тук&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Използване на добавка за виртуални файлове: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Това издание е предоставено от % 1&lt;/p&gt;</translation>
</message>
@@ -5285,22 +5336,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Неуспешно извличане на доставчици</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Неуспешно извличане на доставчици на търсене на „%1“. Грешка: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Търсенето на „%2“ не бе успешно.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Търсенето на „%1“ не бе успешно. Грешка: %2 </translation>
</message>
@@ -5308,7 +5359,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Нов опит на всички качвания</translation>
</message>
@@ -5341,22 +5392,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Потвърждение за Премахване на Профил</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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; да предизвика изтриване на файлове.</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Премахване на връзката</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Отказ</translation>
</message>
@@ -6018,7 +6069,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Нова папка</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Маркиране като прочетено</translation>
</message>
@@ -6127,7 +6178,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Неуспешно свързване на базата данни.</translation>
</message>
@@ -6148,7 +6199,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Търсене на файлове, съобщения, събития...</translation>
</message>
@@ -6172,7 +6223,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Зареждане на още резултати</translation>
</message>
@@ -6210,7 +6261,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Профилът не е свързан</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Действия на профил</translation>
</message>
@@ -6220,18 +6271,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Премахване на профил</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Задаване на състояние</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Отписване</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Вписване</translation>
@@ -6245,52 +6296,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Състояние на линия</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>На линия</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Отсъстващ</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Не безпокой</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Невидим</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Съобщение за състояние</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Какъв е вашият статус?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Изчистване на съобщение за състоянието след това</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Изчистване на съобщението за състоянието</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Задаване на съобщение за състоянието</translation>
</message>
@@ -6376,12 +6427,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Изтегленият файл не съответства на контролната сума, той ще бъде възобновен. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Заглавката на контролната сума съдържаше неизвестен тип контролна сума „%1“</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Изтегленият файл не съответства на контролната сума, той ще бъде възобновен. „%1“ != „%2“</translation>
</message>
@@ -6389,98 +6440,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud основен диалог на работния плот </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Текущ профил</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Възобновяване на синхронизирането за всички</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Пауза в синхронизирането за всички</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Задаване на потребителско състояние</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Добавяне на регистрация</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Добавяне на нов профил</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Изход </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Текущ потребителски аватар</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Текущият потребителски статус е на линия</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Текущият потребителски статус е не безпокойте</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Меню за превключване на профил и настройки</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Отворяне на локалната папка на текущия профил</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Свързан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Без връзка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Отваряне на Nextcloud Разговор в браузъра</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Още приложения</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Меню с приложения</translation>
@@ -6501,7 +6547,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Отваряне на диалоговия прозорец за споделяне</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Още приложения</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Отвори %1 в браузъра</translation>
</message>
@@ -6512,7 +6563,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Показване на повече действия</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Обединен списък с резултати от търсенето</translation>
</message>
@@ -6522,7 +6573,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Споделяне %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Файлова активност</translation>
</message>
@@ -6548,7 +6599,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Изграден от Git редакция &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; на %3, %4 използвайки Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_br.ts b/translations/client_br.ts
index edbba9fd4..4e3c5de17 100644
--- a/translations/client_br.ts
+++ b/translations/client_br.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Sifradenn mnemonic penn-kil-ha-troad</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Evit gwareziñ ho identitelez kriptografek, sifrit anezhi gant unr mnemonic 12 ger dezhañ. Notennit anezho ha gwarnit anezho en ul lec&apos;h sur. Ezhomm ho po eus oute evit ouzhponnañ ardivinkoù all d&apos;ho kont (evel un hezouk pe un urzhiataer).</translation>
</message>
@@ -730,47 +748,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Mont kuit</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Digemprennet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Kemprennet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>N&apos;ez eus ket eus ar servij</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Mod dec&apos;hel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Fazi network</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Ur fazi arventenn</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Goulenn an titouroù idantitelezh</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Stad kont dianv</translation>
</message>
@@ -778,17 +796,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Evit muioc&apos;h a oberniantiz digorit ar meziant oberiantiz.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -849,42 +867,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Ur fazi a zo bet en ur tizhout ar restr arvenntennañ</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Ur fazi a zo bet en ur tizhout ar restr arvenntennañ e %1. Grit sur eo posupl d&apos;an implijourienn tizhout ar restr.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Kuitaat %1</translation>
</message>
@@ -926,7 +944,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1197,8 +1214,8 @@ This action will abort any currently running synchronization.</source>
<translation>Respont disoloer restroù ar servijour en deus kollet roadennoù.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1944,12 +1961,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Ouzhpennañ ur Genstagadenn Kemprennañ Teuliad</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Ouzhpennañ ur Genstagadenn Kemprennet</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Lakait n hent d&apos;an teuliad diabarzh.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Choazit an teuliad orin</translation>
</message>
@@ -1975,7 +1992,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Krouiñ un Teuliad Pell</translation>
</message>
@@ -1985,47 +2002,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Lakait anv an teuliad nevez evit krouiñ anzhañ dindan&apos;%1&apos; :</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Krouet mat eo bet an teuliad wat %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>C&apos;hwitet an dilessa evit tizhout %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>C&apos;hwitet da grouiñ an teuliad war %1. Gwiriit gant an dorn.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>C&apos;hwitet d&apos;ober roll an teuliadoù Fazi : %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Choazit a dra mañ evit kemprenn tout ar c&apos;hont</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>An teuliad a zo dija bet kemprennet.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ho kemprenn emaoc&apos;h dija &lt;i&gt;%1&lt;/i&gt;, ag a zo un teuliad kar eus &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2033,24 +2050,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2071,27 +2088,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>E-klav ebet resevet eus ar servijour, gwiriit ar Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Resevet hon eus E-klavoù disheñvel. Klaskit en dro ar wech da zont.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Ur ment-danvez fall a zo bet responted gant ar servijour</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Kenstagadenn aet da dermenn</translation>
</message>
@@ -2140,83 +2157,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Adnevesadennoù</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Gwiriañ en un doare &amp;otomatek an Adnevesadennoù</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Adloc&apos;hañ &amp;&amp; Adnevesadennoù</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Gwiriañ evit Adnevesadennoù bremañ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Araokadennet</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Goulenn asant a raok kemprennañ teuliadoù brasoc&apos;h eget</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Goulenn an asant a-raok kemprenna lec&apos;hioù renkañ diavaez</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Diskouez an teuliadoù kemprennet e &amp;Explorer&apos;s Navigation Pane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>S&amp;how crash reporter</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Embann Restroù &amp;Ignored</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Kemenadennoù servijour ho deus ezhomm ho hevez.</translation>
</message>
@@ -2226,49 +2245,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2626,7 +2645,7 @@ Skrivet e vo ar gazetenn e %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Fazi</translation>
</message>
@@ -2636,7 +2655,7 @@ Skrivet e vo ar gazetenn e %1</translation>
<translation>&lt;nobr&gt;Ar restr &apos;%1&apos;&lt;br/&gt; na c&apos;hell ket bezhañ digoret evit skrivañ.&lt;br/&gt; &lt;br/&gt;Ar gazetenn disoc&apos;h ne c&apos;hell ket&lt;b&gt;c&apos;hell&lt;/b&gt; ket bezhañ enrollet !&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3518,12 +3537,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3538,22 +3557,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3563,47 +3582,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3613,7 +3632,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3654,44 +3673,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ar restr %1 n&apos;eo ket posupl bezhaén pellkarget peogwir e vank titouroù sifrañ.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Cheñchet eo bet ar restr abaoe m&apos;ema bet disoloet</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>N&apos;eo ket posupl pellkargañ ar restr %1 abalamour d&apos;ur stourm anv restr diabarzh !</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Ar pellkargañ a lamo plas dieub el lenner dindan ar bevenn</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Al lec&apos;h dieub war al lenner a zo dindan %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Lamet eo bet ar rest eus ar servijour</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Ne oa ket posupl pellkargañ ar restr penn-da-benn.</translation>
</message>
@@ -3701,12 +3720,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ar restr pellkarget a zo goulo memes m&apos;en doa laret ar servijour e kemerfe %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Ar restr %1 ne c&apos;hell ket bezhañ enrollet abalamour d&apos;ur stourm anv diabarzh !</translation>
</message>
@@ -3716,18 +3735,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ur fazi a zo bet en ur skrivañ ar metadata er roadenn-diaz</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4114,7 +4133,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Arrest</translation>
</message>
@@ -4161,32 +4180,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Hent ownCloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Skeudennig</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>rannañ tikedenn</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Hent Nextcloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Teuliad : %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 O rannañ</translation>
</message>
@@ -4196,17 +4226,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>N&apos;eo ket rannapl ar restr peogwir eo bet rannet hep aotre rannañ</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Ebarzhit ur ger-tremen d&apos;ho liamm rannet:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Ger-tremen ret evit gellout rannañ</translation>
</message>
@@ -4219,7 +4249,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ger-tremen :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Rannan liamm</translation>
</message>
@@ -4229,7 +4259,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Notenn :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4244,7 +4274,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Deizat termenn :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4254,7 +4284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Termenn :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4349,27 +4379,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Lemmet al liamm rannet</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Gwiriañ Lamadenn al Liamm Rannañ</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Sur oc&apos;h ho peus c&apos;hoant lemel al liamm rannañ publik &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;Notenn : Ne vo ket posupl hen disober.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Diverkañ</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Arrest</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liamm publik</translation>
</message>
@@ -4377,7 +4407,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Rannañ gant implijourienn pe strolladoù ...</translation>
</message>
@@ -4387,7 +4417,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopiañ al liamm</translation>
</message>
@@ -4397,22 +4427,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Disoc&apos;h ebet evit &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Rannet am eus un dra bennak ganeoc&apos;h</translation>
</message>
@@ -4420,7 +4450,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>anv implijer</translation>
</message>
@@ -4430,62 +4460,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>posuple eo embann</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Posuple eo adrannan</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Nag eskemm ken</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Posuple eo krouiñ</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Posuple eo cheñch</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Posuple e lemel</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4512,13 +4542,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Rannet am eus un dra bennak ganeoc&apos;h</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Dibaboù rannañ</translation>
</message>
@@ -4528,79 +4558,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Rannañ dre %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Eila al liamm prevez d&apos;ar golver</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Kas al liamm prevez dre bostel ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>N&apos;eo ket aotret adrannañ ar restr</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Eilañ al liamm publik</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Eilañ al liammm diabarzh</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Cheñch</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Digeriñ er furcher</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Lemel</translation>
</message>
@@ -5176,29 +5227,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Ouzhpenn ur c&apos;hont</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Digeriñ an diviz pennañ</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Arventennoù</translation>
</message>
@@ -5208,22 +5259,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Kuitaat %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1 : %2</translation>
</message>
@@ -5231,24 +5282,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Kliant Burev&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Stumm %1. Evit muioc&apos;h a ditouroù, klikit &lt;a href=&apos;%2&apos;&gt;amañ&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;An digoradenn-mañ a zo bet roet gant %1&lt;/p&gt;</translation>
</message>
@@ -5256,22 +5307,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5279,7 +5330,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Klask en dro pep pellkasadenn</translation>
</message>
@@ -5312,22 +5363,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Gwiriañ Lamaden ar C&apos;hont</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Sur oc&apos;h o peus c&apos;hoant lemel ar genstagadenn d&apos;ar c&apos;hont %1&lt;i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Notenn :&lt;/b&gt; Ne lamo &lt;b&gt;ket&lt;/b&gt; restr ebet.</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Lemel kenstagdenn</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Arrest</translation>
</message>
@@ -5989,7 +6040,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6098,7 +6149,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6119,7 +6170,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6143,7 +6194,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6181,7 +6232,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6191,18 +6242,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Lemel ar c&apos;hont</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Kuitat</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Kennaskañ</translation>
@@ -6216,52 +6267,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6347,12 +6398,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6360,98 +6411,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Kont bremañ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Kendec&apos;hel ar gemprenn evit pep tra</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Ehanañ pep kemprennadenn</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Ouzhpenn ur c&apos;hont</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Arventennoù</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Kuitaat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Kemprennet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Digemprennet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Muioc&apos;h a veziantoù</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6472,7 +6518,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Digeriñ an diviz rannañ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Muioc&apos;h a veziantoù</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Digeriñ %1 er furcher</translation>
</message>
@@ -6483,7 +6534,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6493,7 +6544,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6519,7 +6570,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Krouet gant Git stumm&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; war %3, %4 en ur implij Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index ebf193016..bfbac90fd 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Obre %1 localment</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>En %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Descarta</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Obre el diàleg per compartir</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Clau mnemotècnica del xifratge d&apos;extrem a extrem</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Per a protegir la vostra identitat criptogràfica, la xifrarem amb una clau mnemotècnica de 12 paraules del diccionari. Anoteu-les i deseu-les en un lloc segur. Les necessitareu per a afegir altres dispositius al vostre compte (com ara un telèfon mòbil o un portàtil).</translation>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>S&apos;ha tancat la sessió</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servei no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Mode de manteniment</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de xarxa</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuració</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>S&apos;estan demanant les credencials</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estat del compte desconegut</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Per a veure més activitats, obriu l&apos;aplicació Activitat.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Els fitxers de la llista de fitxers ignorats i els enllaços simbòlics no se sincronitzen.</translation>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Si continueu, &lt;b&gt;se suprimiran aquests paràmetres&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Si continueu, &lt;b&gt;s&apos;ignoraran aquests paràmetres&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Alguns paràmetres s&apos;han configurat en versions més noves d&apos;aquest client i utilitzen característiques no disponibles en aquesta versió.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Ja hi ha una còpia de seguretat del fitxer de configuració actual a &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>S&apos;ha produït un error en accedir al fitxer de configuració</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>S&apos;ha produït un error en accedir al fitxer de configuració a %1. Assegureu-vos que el vostre usuari pugui accedir a aquest fitxer.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Surt del %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1198,8 +1215,8 @@ This action will abort any currently running synchronization.</source>
<translation>Falten dades en la resposta de detecció de fitxers del servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Error del servidor: la resposta PROPFIND no té el format XML.</translation>
</message>
@@ -1938,12 +1955,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Afegeix una connexió de sincronització de carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Afegeix una connexió de sincronització</translation>
</message>
@@ -1961,7 +1978,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Introduïu el camí de la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Seleccioneu la carpeta d&apos;origen</translation>
</message>
@@ -1969,7 +1986,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea una carpeta remota</translation>
</message>
@@ -1979,47 +1996,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Introduïu el nom de la carpeta nova que es crearà a «%1»:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>S&apos;ha creat la carpeta correctament a %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>S&apos;ha produït un error d&apos;autenticació en accedir a %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>No s&apos;ha pogut crear la carpeta a %1. Comproveu-ho manualment.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>No s&apos;han pogut enumerar els elements d&apos;una carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Trieu això per a sincronitzar tot el compte</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Ja s&apos;està sincronitzant aquesta carpeta.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ja esteu sincronitzant &lt;i&gt;%1&lt;/i&gt;, que és una carpeta principal de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ja esteu sincronitzant &lt;i&gt;%1&lt;/i&gt;, que és una subcarpeta de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2027,24 +2044,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Els fitxers virtuals no estan disponibles per la carpeta seleccionada</translation>
</message>
@@ -2065,27 +2082,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No s&apos;ha rebut cap etiqueta d&apos;entitat del servidor; comproveu el servidor intermediari o la passarel·la</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>S&apos;ha rebut una etiqueta d&apos;entitat diferent per a la represa. Es tornarà a intentar la pròxima vegada.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Hem rebut un element Content-Length de baixada inesperat.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor ha retornat un interval de contingut incorrecte</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>S&apos;ha excedit el temps d&apos;espera de la connexió</translation>
</message>
@@ -2134,83 +2151,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualitzacions</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Comprova &amp;automàticament les actualitzacions</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Canal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>estable</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia i actualitza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Comprova ara si hi ha actualitzacions</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avançat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Demana la confirmació abans de sincronitzar carpetes amb una mida superior a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Demana la confirmació abans de sincronitzar fonts d&apos;emmagatzematge extern</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Mostra les carpetes de sincronització a la subfinestra de navegació de l&apos;&amp;Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Mostra l&apos;informador de &amp;fallades</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Edita els fitxers &amp;ignorats</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Crea un arxiu de depuració...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Notificacions del servidor que requereixen atenció.</translation>
</message>
@@ -2220,49 +2239,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>No podeu inhabilitar l&apos;inici automàtic perquè l&apos;inici automàtic per a tot el sistema està habilitat.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Voleu canviar el canal d&apos;actualitzacions?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Canvia el canal d&apos;actualització</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Crea un arxiu de depuració</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Arxius zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>S&apos;ha creat l&apos;arxiu de depuració</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>S&apos;ha creat l&apos;arxiu de depuració a %1</translation>
</message>
@@ -2616,7 +2635,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2626,7 +2645,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;No es pot obrir el fitxer «%1»&lt;br/&gt;en mode d&apos;escriptura.&lt;br/&gt;&lt;br/&gt;&lt;b&gt;No&lt;/b&gt; es pot desar la sortida del registre.&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3507,12 +3526,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El nom del fitxer es troba en la llista de prohibicions del servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>El fitxer té una extensió reservada per als fitxers virtuals.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>mida</translation>
</message>
@@ -3527,22 +3546,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>id de fitxer</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3552,47 +3571,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>S&apos;ha ignorat perquè es troba a la llista de prohibicions «Trieu què voleu sincronitzar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>No es permet perquè no teniu permís per a afegir subcarpetes en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>No es permet perquè no teniu permís per a afegir fitxers en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet carregar aquest fitxer perquè és de només lectura en el servidor; s&apos;està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>S&apos;ha mogut a una destinació no vàlida; s&apos;està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet suprimir; s&apos;està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Error while reading the database</translation>
</message>
@@ -3602,7 +3621,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El servidor ha respost amb un error en llegir la carpeta «%1»: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3643,44 +3662,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No es pot baixar el fitxer %1 perquè falta la informació de xifratge.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El fitxer ha canviat des del descobriment</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>No es pot baixar el fitxer %1 perquè hi ha un conflicte de nom amb un fitxer local.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La baixada reduiria l&apos;espai lliure del disc local per sota del límit</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>L&apos;espai lliure en el disc és inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>S&apos;ha suprimit el fitxer del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>No s&apos;ha pogut baixar el fitxer completament.</translation>
</message>
@@ -3690,12 +3709,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El fitxer baixat està buit malgrat que el servidor ha informat que tindria una mida de %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>No es pot desar el fitxer %1 perquè hi ha un conflicte de nom amb un fitxer local.</translation>
</message>
@@ -3705,18 +3724,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>S&apos;ha produït un error en escriure les metadades a la base de dades</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4103,7 +4122,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descarta</translation>
</message>
@@ -4150,32 +4169,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Camí de l&apos;ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Icona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>etiqueta de compartició</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Camí del Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Compartició de %1</translation>
</message>
@@ -4185,17 +4215,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No es pot compartir el fitxer perquè s&apos;ha compartit sense permisos de compartició.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Introduïu una contrasenya per a l&apos;enllaç de compartició:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Es requereix una contrasenya per a la compartició</translation>
</message>
@@ -4208,7 +4238,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Contrasenya:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Enllaç de compartició</translation>
</message>
@@ -4218,7 +4248,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4233,7 +4263,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Data de venciment:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Estableix la contrasenya</translation>
</message>
@@ -4243,7 +4273,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Venciment:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4338,27 +4368,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Suprimeix l&apos;enllaç de compartició</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmeu la supressió de l&apos;enllaç de compartició</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Segur que voleu suprimir l&apos;enllaç públic de compartició &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Nota: aquesta acció no es pot desfer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Suprimeix</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Enllaç públic</translation>
</message>
@@ -4366,7 +4396,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Comparteix amb usuaris o grups...</translation>
</message>
@@ -4376,7 +4406,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Cerca globalment</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copia l&apos;enllaç</translation>
</message>
@@ -4386,22 +4416,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No hi ha resultats per a «%1»</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>He compartit una cosa amb tu</translation>
</message>
@@ -4409,7 +4439,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nom d&apos;usuari</translation>
</message>
@@ -4419,62 +4449,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Pot editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Contrasenya:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Venciment:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Pot tornar a compartir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Nota per al destinatari</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Deixa de compartir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Pot crear</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Pot canviar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Pot suprimir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Protecció amb contrasenya</translation>
</message>
@@ -4501,13 +4531,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Seleccioneu una ubicació nova…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>He compartit una cosa amb tu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opcions de compartició</translation>
</message>
@@ -4517,79 +4547,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Comparteix mitjançant %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copia l&apos;enllaç privat al porta-retalls</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Envia l&apos;enllaç privat per correu electrònic…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>No es permet tornar a compartir el fitxer</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>No es permet tornar a compartir la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copia l&apos;enllaç públic</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copia l&apos;enllaç intern</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Edita</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Obre en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Resol el conflicte…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Mou i canvia el nom...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Mou, canvia el nom i puja...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Suprimeix els canvis locals</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Mou i puja...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Suprimeix</translation>
</message>
@@ -5165,29 +5216,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Afegeix un compte</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Obre el quadre de diàleg principal</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Atura la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Reprèn la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Paràmetres</translation>
</message>
@@ -5197,22 +5248,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Surt del %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Atura la sincronització de tot</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Reprèn la sincronització de tot</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5220,24 +5271,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Client d&apos;escriptori del %1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versió %1. Per a obtenir més informació, feu clic &lt;a href=&apos;%2&apos;&gt;aquí&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Aquesta versió ha estat proporcionada per %1&lt;/p&gt;</translation>
</message>
@@ -5245,22 +5296,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5268,7 +5319,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Torna a intentar totes les pujades</translation>
</message>
@@ -5301,22 +5352,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Confirmeu la supressió del compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Segur que voleu suprimir la connexió al compte &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; això &lt;b&gt;no&lt;/b&gt; suprimirà cap fitxer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Suprimeix la connexió</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
@@ -5978,7 +6029,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6087,7 +6138,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6108,7 +6159,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6132,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6170,7 +6221,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Compte no connectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Accions del compte</translation>
</message>
@@ -6180,18 +6231,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Suprimeix el compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Tanca la sessió</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Inicia la sessió</translation>
@@ -6205,52 +6256,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6336,12 +6387,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El fitxer baixat no coincideix amb la suma de verificació, es reprendrà. «%1» != «%2»</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6349,98 +6400,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Quadre de diàleg principal del client d&apos;escriptori del Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Compte actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Reprèn la sincronització de tot</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Atura la sincronització de tot</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Afegeix un compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Afegeix un compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Paràmetres</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar de l&apos;usuari actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Canvi de compte i menú de paràmetres</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Obre la carpeta local del compte actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Obre l&apos;aplicació Converses del Nextcloud al navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Més aplicacions</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menú d&apos;aplicacions</translation>
@@ -6461,7 +6507,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Obre el quadre de diàleg de compartició</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Més aplicacions</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
@@ -6472,7 +6523,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Mostra més accions</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6482,7 +6533,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Comparteix %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6508,7 +6559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Compilat a partir de la revisió del Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; el %3 a les %4 mitjançant Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 3e3c26953..87501bc69 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Otevřít %1 lokálně</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>V %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Zahodit</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Otevřít dialog sdílení</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemotechnická fráze pro šifrování mezi koncovými body</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Pro ochranu vaší kryptografické identity ji šifrujeme pomocí mnemotechnické fráze, tvořené 12 slovy ze slovníku. Poznamenejte si ji někam bezpečně. Bude potřebná pro přidání dalších zařízení k vašemu účtu (jako je mobilní telefon či notebook).</translation>
</message>
@@ -734,47 +752,47 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Připojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Režim údržby</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Chyba sítě</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Chyba v nastavení</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Dotazování na přihlašovací údaje</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Neznámý stav účtu</translation>
</message>
@@ -782,17 +800,17 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Více z aktivit si zobrazíte otevřením aplikace Aktivity</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Soubory ze seznamu ignorovaných a symbolické odkazy nejsou synchronizovány.</translation>
</message>
@@ -853,42 +871,42 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Pokračování bude znamenat &lt;b&gt;vymazání těchto nastavení&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Pokračování bude znamenat &lt;b&gt;ignorování těchto nastavení&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Některá nastavení byla vytvořena v novejší verzi tohoto klienta a využívají funkce, které tato verze nepodporuje.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Stávající soubory s nastaveními byly zazálohovány do &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Ukončit</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Pokračovat</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Chyba při přístupu k souboru s nastaveními</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Došlo k chybě při přístupu k souboru s nastaveními %1. Ověřte, že váš uživatelský účet má k souboru přístup.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
@@ -930,7 +948,6 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Soubor %1 nemá platný čas změny. Nenahrávat na server.</translation>
</message>
@@ -1203,8 +1220,8 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<translation>Odpověď ze serveru na objevování souboru postrádá data.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Chyba serveru: odpověď PROPFIND není ve formátu XML!</translation>
</message>
@@ -1959,12 +1976,12 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Přidat připojení pro synchronizaci složky</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Přidat synchronizační připojení</translation>
</message>
@@ -1982,7 +1999,7 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<translation>Zadejte popis umístění místní složky.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Vybrat zdrojovou složku</translation>
</message>
@@ -1990,7 +2007,7 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Vytvořit federovanou složku</translation>
</message>
@@ -2000,47 +2017,47 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<translation>Níže zadejte název pro nově vytvářenou složku „%1“:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Níže zadejte název pro nově vytvářenou složku „%1“:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Složka byl úspěšně vytvořena na %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Chyba ověření při přístupu k %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Na %1 se nepodařilo vytvořit složku. Zkontrolujte to ručně.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Nepodařilo se vypsat obsah složky. Chyba: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Zvolte toto pokud chcete provést synchronizaci celého účtu</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Tato složka už je synchronizována.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Už synchronizujete složku &lt;i&gt;%1&lt;/i&gt;, ve které se složka &lt;i&gt;%2&lt;/i&gt; nachází.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Už synchronizujete složku &lt;i&gt;%1&lt;/i&gt;, která je podsložkou &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2048,24 +2065,24 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Použít virtuální soubory místo okamžitého stahování obsahu %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation> (experimentální)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Ve Windows kořenovém adresáři oddílu disku nejsou virtuální soubory podporovány. Vyberte platný adresář v disku.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Pro označenou složku nejsou virtuální soubory k dispozici</translation>
</message>
@@ -2086,27 +2103,27 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Při navazování byl obdržen jiný E-Tag. Bude znovu vyzkoušeno příště.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Obdržena neočekávaná délka stahovaného obsahu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server vrátil chybný rozsah obsahu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Časový limit pro spojení překročen</translation>
</message>
@@ -2155,83 +2172,85 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Aktualizace</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Automaticky zjišťovat dostupnost aktualizací</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanál</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabilní</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>vývojové</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Restartovat a aktualizovat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Zjistit dostupnost aktualizací nyní</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Pokročilé</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Zeptat se před synchronizací složek větších než</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Zeptat se před synchronizací externích úložišť</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Zobrazit synchronizované složky v podokně navigac&amp;e Průzkumníka</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Zobrazit &amp;hlášení o pádech</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Upravit &amp;ignorované soubory</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Vytvořit archiv s informacemi pro ladění…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Upozornění ze serveru, která vyžadují pozornost.</translation>
</message>
@@ -2241,17 +2260,17 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Automatické spouštění nemůžete vypnout, protože je celosystémově zapnuté pro všechny uživatele.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Změnit kanál aktualizací?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2260,32 +2279,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Poznamenejme, že je možné přejít na novější verzi, ale není možné se vrátit ke starší. To znamená, že návrat z beta kanálu ke stabilnímu obvykle potrvá, protože se čeká, až bude nabídnuta stabilní verze klienta novější, než nainstalovaná vývojová verze.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Změnit kanál aktualizací</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Storno</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Vytvořit archiv s informacemi pro ladění</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip archivy</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Archiv s informacemi pro ladění vytvořen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Archiv s ladicími informacemi je vytvořen v %1</translation>
</message>
@@ -2646,7 +2665,7 @@ Záznamy událostí budou zapisovány do %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
@@ -2656,7 +2675,7 @@ Záznamy událostí budou zapisovány do %1</translation>
<translation>&lt;nobr&gt;Soubor „%1“&lt;br/&gt;se nedaří otevřít pro zápis.&lt;br/&gt;&lt;br/&gt;Výstup záznamu proto &lt;b&gt;nelze&lt;/b&gt; uložit!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>Soubor „%1“&lt;br/&gt; se nepodařilo otevřít pro zápis.&lt;br/&gt;&lt;br/&gt;Výstup záznamu událostí &lt;b&gt;není&lt;/b&gt; možné uložit!&lt;nobr&gt;</translation>
</message>
@@ -3545,12 +3564,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Takový název souboru je na serveru zařazen na seznam nepřípustných.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Soubor má příponu vyhrazenou pro virtuální soubory.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>velikost</translation>
</message>
@@ -3565,22 +3584,22 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>server nahlásil žádné %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>oprávnění</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>identif. souboru</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Server nahlášen číslo %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Není možné provést synchronizaci z důvodu neplatného času změny</translation>
</message>
@@ -3590,47 +3609,47 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Konflikt při nahrávání některých souborů do složky. Ty, které jsou v konfliktu budou vymazány!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Konflikt při nahrávání složky. Bude vymazána!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Konflikt při nahrávání souboru. Bude odebrán!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorováno podle nastavení „vybrat co synchronizovat“</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Neumožněno, protože nemáte oprávnění přidávat podsložky do této složky</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Neumožněno, protože nemáte oprávnění přidávat soubory do této složky</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Není možné tento soubor nahrát, protože je na serveru povoleno pouze čtení – obnovuje se</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Přesunuto do neplatného cíle – obnovuje se</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není umožněno – obnovuje se</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Chyba při čtení databáze</translation>
</message>
@@ -3640,7 +3659,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation>
</message>
@@ -3681,44 +3700,44 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Soubor %1 není možné stáhnout z důvodu chybějících informací o šifrování</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Soubor %1 není možné stáhnout z důvodu chybějících informací o šifrování</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Soubor se mezitím změnil</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Stahování by snížilo volné místo na místním disku pod nastavený limit</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Volného místa na úložišti je méně než %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Soubor byl smazán ze serveru</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Soubor nemohl být kompletně stažen.</translation>
</message>
@@ -3728,12 +3747,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Stažený soubor je prázdný, přestože server oznámil, že by měl mít velikost %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Stažený soubor je prázdný, ale server sdělil, že měl mít %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Soubor %1 nemohl být uložen z důvodu kolize názvu s místním souborem!</translation>
</message>
@@ -3743,18 +3762,18 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Chyba zápisu metadat do databáze</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Soubor %1 nemá platný čas změny, hlášený na server. Neukládat ho.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Chyba při aktualizování metadat: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chvíli používán jinou aplikací</translation>
</message>
@@ -4141,7 +4160,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Odpovědět</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Zamítnout</translation>
</message>
@@ -4188,32 +4207,43 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Popis umístění ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>štítek sdílení</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Popis umístění Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Textový popisek</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Složka: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 sdílení</translation>
</message>
@@ -4223,17 +4253,17 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Tento soubor nelze sdílet, protože byl nasdílen bez umožnění dalšího sdílení dál.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Tento soubor nelze sdílet, protože nemá nastavené oprávnění ke sdílení.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Zadejte heslo pro sdílení odkazem:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Je vyžadováno heslo ke sdílení</translation>
</message>
@@ -4246,7 +4276,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Heslo:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Odkaz sdílení</translation>
</message>
@@ -4256,7 +4286,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Poznámka:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Poznámka</translation>
</message>
@@ -4271,7 +4301,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Datum skončení platnosti:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Nastavit heslo</translation>
</message>
@@ -4281,7 +4311,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Platnost skončí:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Platnost končí</translation>
</message>
@@ -4376,27 +4406,27 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Smazat odkaz pro sdílení</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Potvrďte smazání odkazu pro sdílení</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Opravdu chcete smazat odkaz na veřejné sdílení &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Pozn.: tuto akci nelze vzít zpět.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Smazat</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Storno</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Veřejný odkaz</translation>
</message>
@@ -4404,7 +4434,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Sdílet s uživateli nebo skupinami…</translation>
</message>
@@ -4414,7 +4444,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Hledat všude</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Zkopírovat odkaz</translation>
</message>
@@ -4424,22 +4454,22 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Žádné výsledky pro „%1“</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Žádné výsledky pro „%1“</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>K sdílení je vyžadováno heslo</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Zadejte heslo e-mailového sdílení</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Něco jsem vám nasdílel(a)</translation>
</message>
@@ -4447,7 +4477,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Uživatelské jméno</translation>
</message>
@@ -4457,62 +4487,62 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>lze upravovat</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Může upravovat</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Poznámka:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Heslo:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Platnost skončí:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Příjemce tohoto sdílení může sám dále nasdílet dalším</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Poznámka pro příjemce</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Nastavit datum skončení platnosti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Přestat sdílet</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Může vytvářet</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Může měnit</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Může mazat</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Chránit heslem</translation>
</message>
@@ -4539,13 +4569,13 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Vyberte nové umístění…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Něco jsem vám nasdílel(a)</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Možnosti sdílení</translation>
</message>
@@ -4555,79 +4585,100 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Sdílet prostřednictvím %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Zkopírovat soukromý odkaz do schránky</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Poslat soukromý odkaz e-mailem…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Příjemcům sdílení tohoto souboru není dovoleno ho sdílet dále dalším</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Sdílení této složky dál dalším není umožněno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Zkopírovat veřejný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Zkopírovat interní odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Upravit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Otevřít v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Vyřešit konflikt…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Přesunout a přejmenovat…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Přesunout, přejmenovat a nahrát…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Smazat místní změny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Přesunout a nahrát…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Smazat</translation>
</message>
@@ -5203,29 +5254,29 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Přidat účet</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Otevřít hlavní dialog</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Pokračovat v synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Nastavení</translation>
</message>
@@ -5235,22 +5286,22 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pozastavit synchronizaci u všeho</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Pokračovat v synchronizaci u všeho</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5258,24 +5309,24 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 klient pro počítač&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Verze %1. Další informace získáte kliknutím &lt;a href=&apos;%2&apos;&gt;sem&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Používá zásuvný modul pro virtuální soubory: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Toto vydání bylo poskytnuto %1&lt;/p&gt;</translation>
</message>
@@ -5283,22 +5334,22 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Nepodařilo se získat seznam poskytovatelů.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Nepodařilo se získat z poskytovatelů vyhledávání pro „%1“: Chyba: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Hledání „%2“ se nezdařilo.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Hledání „%1“ se nezdařilo: chyba: %2</translation>
</message>
@@ -5306,7 +5357,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Znovu spustit všechna nahrávání</translation>
</message>
@@ -5339,22 +5390,22 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte odebrání účtu</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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 odebrat propojení s účtem &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Pozn.:&lt;/b&gt; Toto &lt;b&gt;nesmaže&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Odebrat spojení</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Storno</translation>
</message>
@@ -6016,7 +6067,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Nová složka</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Označit jako přečtené</translation>
</message>
@@ -6125,7 +6176,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Nepodařilo se připojit k databázi.</translation>
</message>
@@ -6146,7 +6197,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Hledat soubory, zprávy, události</translation>
</message>
@@ -6170,7 +6221,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Načíst další výsledky</translation>
</message>
@@ -6208,7 +6259,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Účet nepřipojen</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Akce účtu</translation>
</message>
@@ -6218,18 +6269,18 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Odebrat účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Nastavit stav</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Odhlásit se</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Přihlásit</translation>
@@ -6243,52 +6294,52 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Stav online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Pryč</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Nerušit</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Neviditelný</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Stavová zpráva</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Jaký je váš stav?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Vyčistit stavovou zprávu po uplynutí</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Vyčistit stavovou zprávu</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Nastavit stavovou zprávu</translation>
</message>
@@ -6374,12 +6425,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Stažený soubor neodpovídá kontrolnímu součtu, bude stažen znovu. „%1“ != „%2“</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Hlavička kontrolního součtu obsahovala neznámý typ součtu „%1“</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Stažený soubor neodpovídá kontrolnímu součtu, bude stažen znovu. „%1“ != „%2“</translation>
</message>
@@ -6387,98 +6438,93 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Hlavní dialog Nextcloud desktop</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Stávající účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Pokračovat v synchronizaci u všeho</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pozastavit synchronizaci u všeho</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Nastavit stav uživatele</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Přidat účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Přidat nový účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Nastavení</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Konec</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Zástupný obrázek stávajícího uživatele</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Stávající stav uživatele je online</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Stávající stav uživatele je nerušit</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Přepínání účtů a nabídka nastavení</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Otevřít místní složku stávajícího účtu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Připojeno</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Otevřít Nextcloud Talk v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Více aplikací</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Nabídka aplikací</translation>
@@ -6499,7 +6545,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Otevřít dialog sdílení</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Více aplikací</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
@@ -6510,7 +6561,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Zobrazit další akce</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Seznam výsledků sjednoceného vyhledávání</translation>
</message>
@@ -6520,7 +6571,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Sdílet %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 – aktivita ohledně souboru</translation>
</message>
@@ -6546,7 +6597,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Sestaveno z Git revize &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 s použitím Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_da.ts b/translations/client_da.ts
index 75f383359..5619b6f76 100644
--- a/translations/client_da.ts
+++ b/translations/client_da.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Åbn %1 lokalt</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Huskeregel for end-to-end kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>For at beskytte din kryptografiske identitet krypterer vi den vha. en huskeregel med 12 ordbogsopslag. Noter den venligst ned og opbevar dem sikkert. De skal bruges for at tilføje andre enheder til din konto (fx mobil eller bærbar).</translation>
</message>
@@ -734,47 +752,47 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Logget ud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Forbundet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Service utilgængelig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Vedligeholdelsestilstand</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Netværksfejl</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Konfigurationsfejl</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Forespørger om brugeroplysninger</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Ukendt konto tilstand</translation>
</message>
@@ -782,17 +800,17 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>For flere aktiviteter åbn Activity app&apos;n.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Filer fra ignorerlisten såvel som symbolske links synkroniseres ikke.</translation>
</message>
@@ -853,42 +871,42 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>At fortsætte vil betyde at &lt;b&gt;disse indstillinger slettes&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>At fortsætte vil betyde at &lt;b&gt;disse indstillinger ignoreres&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Nogle indstillinger blev konfigureret i en nyere version af denne klient og anvender funktionaliteter der ikke er tilgængelig i denne version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Den nuværende konfigurationsfil er blevet sikkerhedskopieret til &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Afslut</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Fortsæt</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Adgang til konfigurationsfilen fejlede</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Der opstod en fejl, kunne ikke tilgå konfigurations filen %1. Sørg for at filen kan tilgås af din bruger.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Afslut %1</translation>
</message>
@@ -930,7 +948,6 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1201,8 +1218,8 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<translation>Serverens fil opdagelse svar mangler data.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1948,12 +1965,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Opret mappesynkroniseringsforbindelse</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Tilføj synkroniseringsforbindelse</translation>
</message>
@@ -1971,7 +1988,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Angiv stien til den lokale mappe.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Vælg kildemappen</translation>
</message>
@@ -1979,7 +1996,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Opret den afsides mappe</translation>
</message>
@@ -1989,47 +2006,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Angiv navnet til den nye mappe at oprette under &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Mappe oprettet med succes hos %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Godkendelse fejlet ved adgang til %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Fejl ved oprettelse af mappe på %1. Undersøg venligst manuelt.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Fejl ved visning af mappe. Fejl: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Vælg dette for sync af hele kontoen</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Den mappe er allerede synkroniseret.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Du synkroniserer allerede &lt;i&gt;%1&lt;/i&gt;, der er en mappe over &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2037,24 +2054,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2075,27 +2092,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen E-Tag modtaget fra server, kontroller Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi modtog et andet E-Tag for at fortsætte. Prøver igen næste gang.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server returnerede forkert indholdsinterval</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Forbindelse udløbet</translation>
</message>
@@ -2144,83 +2161,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Opdateringer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Søg &amp;automatisk efter opdateringer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Genstart &amp;&amp; Opdater</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Søg efter Opdateringer nu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanceret</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Spørg om bekræftelse inden synkronisering af mapper større end</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Spørg om bekræftelse inden synkronisering af eksterne lagre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Vis sync mapper i &amp;Eksplorers Navigations Panel</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>V&amp;is nedbruds rapportering</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Rediger &amp;Ignorerede Filer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Server notifikationer der kræver opmærksomhed.</translation>
</message>
@@ -2230,49 +2249,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2630,7 +2649,7 @@ Loggen bliver skrevet til %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Fejl</translation>
</message>
@@ -2640,7 +2659,7 @@ Loggen bliver skrevet til %1</translation>
<translation>&lt;nobr&gt;Fil &apos;%1&apos;&lt;br/&gt;kan ikke åbnes for skrivning.&lt;br/&gt;&lt;br/&gt;Log resultatet kan &lt;b&gt;ikke&lt;/b&gt; gemmes!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3522,12 +3541,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3542,22 +3561,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3567,47 +3586,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3617,7 +3636,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3658,44 +3677,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Fil %1 kan ikke hentes fordi der mangler kryptograferings information.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Fil er ændret siden opdagelse</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Fil %1 kan ikke hentes på grund af lokal navnekonflikt!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Nedlagringen ville reducere ledig disk plads på lokalt lager under grænsen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Ledig disk plads er under %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Fil var slettet fra server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Filen kunne ikke hentes helt.</translation>
</message>
@@ -3705,12 +3724,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Den hentede fil er tom selvom serveren annoncerede den skulle have været %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan ikke gemmes på grund af lokal navnekonflikt!</translation>
</message>
@@ -3720,18 +3739,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Fejl ved skrivning af metadata til databasen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4118,7 +4137,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Afvis</translation>
</message>
@@ -4165,32 +4184,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud Sti:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikon</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>del mærke</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud Sti:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Mappe: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Deling</translation>
</message>
@@ -4200,17 +4230,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Filen kan ikke deles fordi den blev delt uden tilladelse til deling.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Indtast venligst et kodeord til denne linkdeling</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Password til deling påkrævet</translation>
</message>
@@ -4223,7 +4253,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Kodeord:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Del link</translation>
</message>
@@ -4233,7 +4263,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Note:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4248,7 +4278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Udløbsdato:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4258,7 +4288,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Udløber:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4353,27 +4383,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Slet delingslink</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Bekræft sletning af delt link</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ønsker du virkelig at fjerne offentlig link deling &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: Denne handling kan ikke fortrydes.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Slet</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Annuller</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Offentligt link</translation>
</message>
@@ -4381,7 +4411,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Del med brugere eller grupper</translation>
</message>
@@ -4391,7 +4421,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopiér link</translation>
</message>
@@ -4401,22 +4431,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ingen resultater for &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Jeg delte noget med dig</translation>
</message>
@@ -4424,7 +4454,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Brugernavn</translation>
</message>
@@ -4434,62 +4464,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>kan redigere</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Kan gendele</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Ophæv deling</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Kan oprette</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Kan ændre</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Kan slette</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4516,13 +4546,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Jeg delte noget med dig</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Dele muligheder</translation>
</message>
@@ -4532,79 +4562,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Del via %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopier privat link til udklipsholderen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Send privat link via e-mail …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Videredeling af denne fil ikke tilladt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopier offentligt link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopier internt link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Rediger</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Åbn i browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Slet</translation>
</message>
@@ -5180,29 +5231,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Tilføj konto</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Åben hoved dialog</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Indstillinger</translation>
</message>
@@ -5212,22 +5263,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Afslut %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5235,24 +5286,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1-skrivebordsklient&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Version %1. For mere information venligst klik &lt;a href=&apos;%2&apos;&gt;her&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Denne udgivelse blev leveret af %1&lt;/p&gt;</translation>
</message>
@@ -5260,22 +5311,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5283,7 +5334,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Prøv alle uploads igen</translation>
</message>
@@ -5316,22 +5367,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Bekræft sletning af konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Ønsker du virkelig at fjerne forbindelse til kontoen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt;Dette sletter &lt;b&gt;ikke&lt;/b&gt;nogen filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Fjern forbindelse</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Annullér</translation>
</message>
@@ -5993,7 +6044,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ny mappe</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6102,7 +6153,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6123,7 +6174,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6147,7 +6198,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6185,7 +6236,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Kontoen er ikke tilknyttet</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Kontohandlinger</translation>
</message>
@@ -6195,18 +6246,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Fjern konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Log ud</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Log ind</translation>
@@ -6220,52 +6271,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6351,12 +6402,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Den hentede fil matcher ikke kontrolsummen, den vil blive genoptaget. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6364,98 +6415,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Hovedvindue for Nextcloud-skrivebordsklienten</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Nuværende konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Genoptag synkronisering for alle</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Sæt alle synk. på pause</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Tilføj konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Tilføj ny konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Indstillinger</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Afslut</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Nuværende bruger-avater</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Nuværende brugerstatus er online</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Nuværende brugerstatus er forstyr ikke</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Menuen til kontoskift og indstillinger</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Åbn lokal mappe for nuværende konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Forbundet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Åbn Nextcloud Talk i browseren</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Flere apps</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Apps-menuen</translation>
@@ -6476,7 +6522,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Åbn delingsdialog</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Flere apps</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Åbn %1 i browser</translation>
</message>
@@ -6487,7 +6538,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Vis flere handlinger</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6497,7 +6548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Del %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6523,7 +6574,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Bygget fra Git-revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; på %3, %4 med Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 08ac40560..2159205f9 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>%1 lokal öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>In %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Ablehnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Teilen-Dialog öffnen</translation>
</message>
@@ -69,7 +69,7 @@
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="147"/>
<source>Talk notification caller avatar</source>
- <translation>Avatar zu Benachrichtigung von Talk-Anrufer</translation>
+ <translation>Avatar zu Benachrichtigung über Talk-Anrufer</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="213"/>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Gedächtnisstütze für Ende-zu-Ende Verschlüsselung</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Um Ihre kryptografische Identität zu schützen, verschlüsseln wir sie mit einer Gedächtnisstütze von 12 Wörterbuchwörtern. Bitte notieren Sie sich diese und bewahren Sie sie auf. Sie werden benötigt, um Ihrem Konto weitere Geräte hinzuzufügen (z. B. Ihr Mobiltelefon oder Laptop).</translation>
</message>
@@ -734,47 +752,47 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Verbunden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Dienst nicht verfügbar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Wartungsmodus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Netzwerkfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Konfigurationsfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Zugangsdaten werden abgefragt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Unbekannter Konto-Zustand</translation>
</message>
@@ -782,17 +800,17 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Um weitere Aktivitäten anzusehen bitte die Activity-App öffnen.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation>Aktivitäten abrufen…</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Dateien aus der Ignorierliste sowie symbolische Links werden nicht synchronisiert.</translation>
</message>
@@ -853,42 +871,42 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Wenn Sie fortfahren, werden &lt;b&gt;diese Einstellungen gelöscht&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Wenn Sie fortfahren, werden &lt;b&gt;diese Einstellungen ignoriert&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Einige Einstellungen wurden in neueren Versionen dieses Clients konfiguriert und verwenden Funktionen, die in dieser Version nicht verfügbar sind.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Die aktuelle Konfigurationsdatei wurde bereits auf &lt;i&gt;%2&lt;/i&gt; gesichert.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Beim Zugriff auf die Konfigurationsdatei bei %1 ist ein Fehler aufgetreten. Stellen Sie sicher, dass Ihr Benutzer auf die Datei zugreifen kann.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Beende %1</translation>
</message>
@@ -930,7 +948,6 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Die Datei %1 hat eine ungültige Änderungszeit. Nicht auf den Server hochladen.</translation>
</message>
@@ -1203,8 +1220,8 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
<translation>In der Antwort der Server-Dateierkennung fehlen Daten.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverantwort: PROPFIND-Antwort ist nicht im XML-Format!</translation>
</message>
@@ -1960,12 +1977,12 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Ordner-Synchronisierung hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Synchronisierung hinzufügen</translation>
</message>
@@ -1983,7 +2000,7 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<translation>Pfad zum lokalen Ordner eingeben</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Quellordner auswählen</translation>
</message>
@@ -1991,7 +2008,7 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Entfernten Ordner erstellen</translation>
</message>
@@ -2001,47 +2018,47 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<translation>Geben Sie den Namen des neuen, unter &apos;%1&apos; zu erstellenden Ordners ein: </translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Geben Sie den Namen des neuen, unter &quot;%1&quot; zu erstellenden Ordners ein: </translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Ordner auf %1 erstellt.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Beim Zugriff auf %1 ist die Authentifizierung fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Konnte Ordner nicht listen. Fehler: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Dieser Ordner wird bereits synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, der ein übergeordneter Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, der ein Unterordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
</message>
@@ -2049,24 +2066,24 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Virtuelle Dateien verwenden, anstatt den Inhalt sofort herunterzuladen %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimentell)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Virtuelle Dateien werden für die Wurzel von Windows-Partitionen als lokaler Ordner nicht unterstützt. Bitte wählen Sie einen gültigen Unterordner unter dem Laufwerksbuchstaben.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation>
</message>
@@ -2087,27 +2104,27 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy/Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedliches E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Wir haben eine unerwartete Download-Content-Länge erhalten.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server hat falschen Bereich für den Inhalt zurückgegeben</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -2156,83 +2173,85 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<translation>Anrufbenachrichtigungen anzeigen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Aktualisierungen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Automatisch auf Aktualisierungen prüfen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>Stabil</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>Beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Neustarten &amp;&amp; aktualisieren</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Jetzt auf Aktualisierungen prüfen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Erweitert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Bestätigung erfragen, bevor Ordner synchronisiert werden. Grenze:</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Bestätigung erfragen, bevor externe Speicher synchronisiert werden</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Synchronisierungsordner im Navigationsbereich des &amp;Explorers anzeigen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>&amp;Crash-Reporter anzeigen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>I&amp;gnorierte Dateien bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Debug-Archiv erstellen …</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Server-Benachrichtigungen, die Aufmerksamkeit erfordern.</translation>
</message>
@@ -2242,17 +2261,17 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<translation>Dialog zu Anrufbenachrichtigungen anzeigen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Sie können den Autostart nicht deaktivieren, da der systemweite Autostart aktiviert ist.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Update-Kanal ändern?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Beachten Sie bitte, dass hierdurch nur ausgewählt wird, aus welchem Pool Upgrades heruntergeladen werden und dass Downgrades nicht möglich sind. Die Rückkehr vom Beta- zum stabilen Kanal kann daher zumeist nicht sofort erfolgen, sondern es muss auf eine neue stabile Version gewartet werden, die neuer als die aktuell installierte Beta ist.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Update-Kanal ändern</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Debug-Archiv erstellen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip-Archive</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Debug-Archiv erstellt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Debug-Archiv erstellt in %1</translation>
</message>
@@ -2647,7 +2666,7 @@ Protokolle werden in % 1 geschrieben</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
@@ -2657,7 +2676,7 @@ Protokolle werden in % 1 geschrieben</translation>
<translation>&lt;nobr&gt;Datei &apos;%1&apos;&lt;br/&gt;kann nicht zum Schreiben geöffnet werden.&lt;br/&gt;&lt;br/&gt;Die Protokolldatei kann &lt;b&gt;nicht&lt;/b&gt; gespeichert werden!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Datei &quot;%1&quot;&lt;br/&gt;kann nicht zum Schreiben geöffnet werden.&lt;br/&gt;&lt;br/&gt;Die Protokolldatei kann &lt;b&gt;nicht&lt;/b&gt; gespeichert werden!&lt;/nobr&gt;</translation>
</message>
@@ -3545,12 +3564,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Der Dateiname steht auf dem Server auf einer schwarzen Liste.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Die Endung der Datei ist für virtuelle Dateien reserviert.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>Größe</translation>
</message>
@@ -3565,22 +3584,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Server meldet kein %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>Berechtigung</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>Datei-ID</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Server meldet keine %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Synchronisierung wegen ungültiger Änderungszeit nicht möglich</translation>
</message>
@@ -3590,47 +3609,47 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Konflikt beim Hochladen einiger Dateien in einen Ordner. Diejenigen, die in Konflikt stehen, werden gelöscht!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Konflikt beim Hochladen eines Ordners. Er wird gelöscht!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Konflikt beim Hochladen einer Datei. Sie wird entfernt!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignoriert wegen der &quot;Choose what to sync&quot;-Blacklist</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Nicht erlaubt, da Sie nicht die Berechtigung haben, Unterordner zu diesem Ordner hinzuzufügen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Nicht erlaubt, da Sie keine Berechtigung zum Hinzufügen von Dateien in diesen Ordner haben.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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. Wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Auf ungültiges Ziel verschoben, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Entfernen nicht erlaubt, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Fehler beim Lesen der Datenbank</translation>
</message>
@@ -3640,7 +3659,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Der Server hat während des Lesens des Verzeichnisses &apos;%1&apos; mit einem Fehler geantwortet: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Der Server hat während des Lesens des Verzeichnisses &quot;%1&quot; mit einem Fehler geantwortet: %2</translation>
</message>
@@ -3681,44 +3700,44 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Datei %1 kann nicht heruntergeladen werden, da keine Verschlüsselungsinformationen vorhanden sind.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Die Datei %1 kann nicht heruntergeladen werden, da die Verschlüsselungsinformationen fehlen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Datei ist seit der Entdeckung geändert worden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht heruntergeladen werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Das Herunterladen würde den lokalen freien Speicherplatz unter die Grenze reduzieren</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Der freie Speicher auf der Festplatte ist weniger als %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Die Datei wurde vom Server gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Die Datei konnte nicht vollständig heruntergeladen werden.</translation>
</message>
@@ -3728,12 +3747,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konflikts mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
</message>
@@ -3743,18 +3762,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Datei %1 hat eine ungültige Änderungszeit, die vom Server gemeldet wurde. Speichern Sie sie nicht.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Fehler beim Aktualisieren der Metadaten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
@@ -4141,7 +4160,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Antworten</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Ausblenden</translation>
</message>
@@ -4188,32 +4207,43 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Nextcloud-Pfad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Symbol</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>Freigabe-Label</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud-Pfad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Ordner: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1-Freigabe</translation>
</message>
@@ -4223,17 +4253,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Die Datei kann nicht geteilt werden, weil sie keine Berechtigung zum Teilen hat.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Bitte Passwort für die Link-Freigabe eingeben:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Passwort für die Freigabe erforderlich</translation>
</message>
@@ -4246,7 +4276,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Passwort:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Link teilen</translation>
</message>
@@ -4256,7 +4286,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Anmerkung:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Notiz</translation>
</message>
@@ -4271,7 +4301,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Ablaufdatum:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Passwort setzen</translation>
</message>
@@ -4281,7 +4311,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Ablaufdatum:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Läuft ab</translation>
</message>
@@ -4376,27 +4406,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Freigabe-Link löschen</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Löschen des öffentlichen Links bestätigen</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Möchten Sie wirklich den öffentlichen Link &lt;i&gt;%1 &lt;/i&gt;löschen?&lt;p&gt;Hinweis: Dies kann nicht rückgängig gemacht werden.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Öffentlicher Link</translation>
</message>
@@ -4404,7 +4434,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Mit Benutzern oder Gruppen teilen …</translation>
</message>
@@ -4414,7 +4444,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Global suchen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Link kopieren</translation>
</message>
@@ -4424,22 +4454,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Keine Ergebnisse für &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Keine Ergebnisse für &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Passwort für die Freigabe erforderlich</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Bitte geben Sie ein Passwort für die E-Mail-Freigabe ein:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Ich habe etwas mit Ihnen geteilt</translation>
</message>
@@ -4447,7 +4477,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Benutzername</translation>
</message>
@@ -4457,62 +4487,62 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>kann bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Kann bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Notiz:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Passwort:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Läuft ab:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>kann weiterteilen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Notiz an Empfänger</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Ablaufdatum setzen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Freigabe aufheben</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>kann erstellen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>kann ändern</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>kann löschen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Passwortschutz</translation>
</message>
@@ -4539,13 +4569,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Neuen Ort auswählen …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Ich habe etwas mit Ihnen geteilt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Freigabeoptionen</translation>
</message>
@@ -4555,79 +4585,100 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Teilen mittels %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Privater Link in die Zwischenablage kopiert</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Privaten Link als E-Mail verschicken …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Weiterteilen dieser Datei ist nicht erlaubt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Weiterteilen dieses Ordners ist nicht erlaubt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Öffentlichen Link kopieren</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopiere internen Link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Konflikt lösen…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Verschieben und umbenennen …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Verschieben, umbenennen und hochladen …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Lokale Änderungen löschen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Verschieben und hochladen …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
@@ -5203,29 +5254,29 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Hauptfenster öffnen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Synchronisierung pausieren</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Synchronisierung fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
@@ -5235,22 +5286,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Synchronisierung für alle pausieren</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Synchronisierung für alle fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5258,24 +5309,24 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Desktop-Client&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Version %1. Für weitere Informationen klicken Sie bitte &lt;a href=&apos;%2&apos;&gt;hier&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Plugin für virtuelle Dateien: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Diese Version wird von %1 bereitgestellt&lt;/p&gt;</translation>
</message>
@@ -5283,22 +5334,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Anbieter konnten nicht abgerufen werden.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Konnte Suchanbieter für &apos;%1&apos; nicht abrufen. Fehler: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Suche nach &apos;%2&apos; fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Suche nach &apos;%1&apos; fehlgeschlagen. Fehler: %2</translation>
</message>
@@ -5306,7 +5357,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Alle Uploads neu starten</translation>
</message>
@@ -5339,22 +5390,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Kontenentfernung bestätigen</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Möchten Sie wirklich die Verbindung zum Konto &lt;i&gt;%1&lt;/i&gt; entfernen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; Es werden &lt;b&gt;keine&lt;/b&gt; Dateien gelöscht.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Verbindung entfernen</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
@@ -6016,7 +6067,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Neuer Ordner</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Als gelesen markieren</translation>
</message>
@@ -6125,7 +6176,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Fehler beim Verbinden mit der Datenbank.</translation>
</message>
@@ -6146,7 +6197,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Suche Dateien, Nachrichten und Termine …</translation>
</message>
@@ -6170,7 +6221,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Weitere Ergebnisse laden</translation>
</message>
@@ -6208,7 +6259,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Konto nicht verbunden</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Konto-Aktionen</translation>
</message>
@@ -6218,18 +6269,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Konto entfernen</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Status setzen</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Abmelden</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Anmelden</translation>
@@ -6243,52 +6294,52 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Online-Status</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Abwesend</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Nicht stören</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Unsichtbar</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Statusnachricht</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Wie ist Ihr Status?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Statusnachricht löschen nach</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Statusnachricht löschen</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Statusnachricht setzen</translation>
</message>
@@ -6374,12 +6425,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Die heruntergeladene Datei stimmt nicht mit der Prüfsumme überein, sie wird fortgesetzt. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Der Prüfsummen-Header enthielt einen unbekannten Prüfsummentyp &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Die heruntergeladene Datei stimmt nicht mit der Prüfsumme überein, sie wird fortgesetzt. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6387,98 +6438,93 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud Desktop-Hauptdialog</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Aktuelles Konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Synchronisierung für alle fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Synchronisierung für alle pausieren</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Benutzerstatus setzen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Neues Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Beenden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar des aktuellen Benutzers</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Aktueller Benutzerstatus ist Online</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Aktueller Benutzerstatus ist Nicht stören</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Konto-Umschalter und Einstellungsmenü</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Lokalen Ordner des aktuellen Kontos öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Verbunden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Nextcloud Talk im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Weitere Apps</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Apps-Menü</translation>
@@ -6499,7 +6545,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Teilen-Dialog öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Weitere Apps</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
@@ -6510,7 +6561,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Weitere Aktionen anzeigen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Einheitliche Suchergebnisliste</translation>
</message>
@@ -6520,7 +6571,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>%1 teilen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Dateiaktivitäten</translation>
</message>
@@ -6546,7 +6597,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Gebaut von der git-Revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; auf %3, %4 verwendet Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index 481300ad9..6d002cea2 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Ανοίξτε το %1 τοπικά</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Από άκρη σε άκρη απομνημόνευση κρυπτογράφησης</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Για την προστασία της Κρυπτογραφικής σας Ταυτότητας, την αποκρύψαμε με απομνημόνευση 12 λέξεων. Παρακαλώ σημειώστε τις και κρατήστε τις ασφαλείς. Θα χρειαστούν σε περίπτωση που θέλετε να προσθέσετε άλλες συσκευές στον λογαριασμό σας (όπως το κινητό ή το λαπτοπ).</translation>
</message>
@@ -730,47 +748,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Συνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Η υπηρεσία δεν είναι διαθέσιμη</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Κατάσταση συντήρησης</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Σφάλμα δικτύου</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Σφάλμα ρυθμίσεων</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Ερώτηση πιστοποιητικών</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Άγνωστη κατάσταση λογαριασμού</translation>
</message>
@@ -778,17 +796,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Για εμφάνιση περισσότερων δραστηριοτήτων παρακαλώ ανοίξτε την εφαρμογή Activity.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Τα αρχεία από τη λίστα παράβλεψης καθώς και οι συμβολικοί σύνδεσμοι δεν συγχρονίζονται.</translation>
</message>
@@ -849,42 +867,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Η συνέχιση θα σημαίνει διαγραφή αυτών των ρυθμίσεων.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Η συνέχιση θα σημαίνει διαγραφή αυτών των ρυθμίσεων.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ορισμένες ρυθμίσεις διαμορφώθηκαν σε νεότερες εκδόσεις αυτού του πελάτη και χρησιμοποιούν λειτουργίες που δεν είναι διαθέσιμες σε αυτήν την έκδοση.&lt;br&gt;&lt;br&gt;%1 &lt;br&gt;&lt;br&gt;Το τρέχον αρχείο διαμόρφωσης έχει ήδη μπει σε διαδικασία δημιουργίας αντιγράφων ασφαλείας έως &lt;i&gt; 2%&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Έξοδος</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Συνέχεια</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Σφάλμα πρόσβασης στο αρχείο ρυθμίσεων</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Υπήρξε σφάλμα κατά την πρόσβαση του αρχείου ρυθμίσεων στο %1. Παρακαλώ επαληθεύστε αν μπορείτε να προσπελάσετε το αρχείο.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
@@ -926,7 +944,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1199,8 +1216,8 @@ This action will abort any currently running synchronization.</source>
<translation>Η αναζήτηση αρχείων διακομιστή απάντησε με ελλιπή δεδομένα.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Σφάλμα διακομιστή: Η απάντηση PROPFIND δεν έχει μορφοποίηση XML!</translation>
</message>
@@ -1949,12 +1966,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation>
</message>
@@ -1972,7 +1989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Εισάγετε τη διαδρομή προς τον τοπικό φάκελο.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Επιλογή του φακέλου προέλευσης</translation>
</message>
@@ -1980,7 +1997,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Δημιουργία Απομακρυσμένου Φακέλου</translation>
</message>
@@ -1990,47 +2007,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Εισάγετε το όνομα του νέου φακέλου που θα δημιουργηθεί παρακάτω &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Εισαγάγετε το όνομα του νέου φακέλου που θα δημιουργηθεί παρακάτω &quot;%1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Επιτυχής δημιουργία φακέλου στο %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Η πιστοποίηση απέτυχε κατά την πρόσβαση %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Αδυναμία εμφάνισης ενός φακέλου. Σφάλμα: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ο φάκελος &lt;i&gt;%1&lt;/i&gt;, ο οποίος είναι γονεϊκός φάκελος του &lt;i&gt;%2&lt;/i&gt;, συγχρονίζεται ήδη.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Συγχρονίζετε ήδη το &lt;i&gt;1% &lt;/i&gt;, το οποίο είναι υποφάκελος του&lt;/i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2038,24 +2055,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Χρησιμοποιήστε εικονικά αρχεία αντί να κατεβάσετε το περιεχόμενο άμεσα %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(πειραματικό)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Τα εικονικά αρχεία δεν είναι διαθέσιμα για τον επιλεγμένο φάκελο.</translation>
</message>
@@ -2076,27 +2093,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διαμεσολαβητή/πύλη</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Λάβαμε μια απροσδόκητη λήψη Content-Length.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
@@ -2145,83 +2162,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Ενημερώσεις</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Αυτόματος έλεγχος για Ενημερώσεις</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Κανάλι</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>σταθερός</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>έκδοση beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Επανεκκίνηση &amp;&amp; Ενημέρωση</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Ελεγχος για Ενημερώσεις τώρα</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Για προχωρημένους</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Ζητήστε επιβεβαίωση πριν τον συγχρονισμό φακέλων μεγαλύτερων από</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>ΜΒ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Ζητήστε επιβεβαίωση πριν τον συγχρονισμό εξωτερικών αποθηκευτικών χώρων</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Εμφάνιση φακέλων συγχρονισμού στο &amp;Παράθυρο Περιήγησης του Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>S&amp;πως κατάρρευση αναφοράς</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Επεξεργασία &amp;αγνοημένων αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Δημιουργία αρχείου εντοπισμού σφαλμάτων…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Ειδοποιήσεις από τον διακομιστή που απαιτούν την προσοχή σας.</translation>
</message>
@@ -2231,17 +2250,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Δεν μπορείτε να απενεργοποιήσετε την αυτόματη εκκίνηση επειδή είναι ενεργοποιημένη η αυτόματη εκκίνηση σε όλο το σύστημα.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Αλλαγή καναλιού ενημέρωσης;</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2249,32 +2268,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Λάβετε υπόψη ότι αυτό επιλέγει μόνο από τη δεξαμενήαπό την οποία προέρχονται οι αναβαθμίσεις της ομάδας και ότι δεν υπάρχουν υποβαθμίσεις: Επομένως, η επιστροφή από το κανάλι beta στο σταθερό κανάλι συνήθως δεν μπορεί να γίνει αμέσως και σημαίνει αναμονή για μια σταθερή έκδοση που είναι νεότερη από την τρέχουσα εγκατεστημένη έκδοση beta.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Αλλαγή καναλιού ενημέρωσης.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Ακύρωση</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Δημιουργία αρχείου εντοπισμού σφαλμάτων.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Αρχεία zip.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Δημιουργήθηκε αρείο εντοπισμού σφαλμάτων.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Το αρχείο εντοπισμού σφαλμάτων δημιουργείται στο % 1.</translation>
</message>
@@ -2633,7 +2652,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
@@ -2643,7 +2662,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Το αρχείο &apos;%1&apos;&lt;br/&gt;δεν μπορεί να ανοιχθεί για εγγραφή.&lt;br/&gt;&lt;br/&gt;Το αρχείο καταγραφής &lt;b&gt;δεν&lt;/b&gt; μπορεί να αποθηκευτεί!&lt;/nobr&gt; </translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3526,12 +3545,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Το όνομα αρχείου είναι στη μαύρη λίστα στον διακομιστή.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Το αρχείο έχει επέκταση που προορίζεται για εικονικά αρχεία.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>μέγεθος</translation>
</message>
@@ -3546,22 +3565,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ο διακομιστής δεν ανέφερε %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>αναγνωριστκό αρχείου (id)</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3571,47 +3590,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Μετακινήθηκε σε μη έγκυρο στόχο, επαναφορά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η κατάργηση, επαναφορά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Σφάλμα κατά την ανάγνωση της βάσης δεδομένων.</translation>
</message>
@@ -3621,7 +3640,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ο διακομιστής απάντησε με σφάλμα κατά την ανάγνωση της διεύθυνσης ΄%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3662,44 +3681,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Δεν είναι δυνατή η λήψη του αρχείου %1, διότι λείπουν οι πληροφορίες κρυπτογράφησης.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Η λήψη θα μειώση τον ελεύθερο τοπικό χώρο αποθήκευσης κάτω από το όριο.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
</message>
@@ -3709,12 +3728,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Το ληφθέν αρχείο είναι άδειο, παρόλο που ο διακομιστής ανακοίνωσε ότι θα έπρεπε να ήταν% 1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
@@ -3724,18 +3743,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Το αρχείο %1 χρησιμοποιείται αυτήν τη στιγμή</translation>
</message>
@@ -4122,7 +4141,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Αποδέσμευση</translation>
</message>
@@ -4169,32 +4188,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Διαδρομή ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Εικονίδιο</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>Διαμοιρασμός ετικέτας</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud Διαδρομή:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Φάκελος: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Διαμοιράστηκε</translation>
</message>
@@ -4204,17 +4234,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Παρακαλώ εισάγετε κωδικό πρόσβασης για το κοινόχρηστο σύνδεσμο:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Απαιτείται κωδικός πρόσβασης για το κοινόχρηστο</translation>
</message>
@@ -4227,7 +4257,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Συνθηματικό :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Κοινή χρήση συνδέσμου</translation>
</message>
@@ -4237,7 +4267,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Σημείωση:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Σημείωση</translation>
</message>
@@ -4252,7 +4282,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ημερομηνία λήξης:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Ορισμός συνθηματικού</translation>
</message>
@@ -4262,7 +4292,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Λήγει:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Λήγει</translation>
</message>
@@ -4357,27 +4387,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Διαγραφή κοινόχρηστου συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Επιβεβαίωση Διαγραφής Κοινόχρηστου Συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε σίγουρα να διαγράψετ τον δημόσιο σύνδεσμο κοινής χρήσης &lt;i&gt; %1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Σημείωση: Η ενέργεια δεν αναιρείται.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Διαγραφή</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Ακύρωση</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Δημόσιος σύνδεσμος</translation>
</message>
@@ -4385,7 +4415,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Διαμοιρασμός με χρήστες ή ομάδες ...</translation>
</message>
@@ -4395,7 +4425,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Αναζήτηση παγκοσμίως</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Αντιγραφή συνδέσμου</translation>
</message>
@@ -4405,22 +4435,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Κανένα αποτέλεσμα για &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Μοιράστηκα κάτι μαζί σου</translation>
</message>
@@ -4428,7 +4458,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Όνομα χρήστη</translation>
</message>
@@ -4438,62 +4468,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>δυνατότητα επεξεργασίας</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Σημείωση:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Συνθηματικό:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Λήγει:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Δυνατότητα να διαμοιραστεί ξανά</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Ορισμός ημερομηνίας λήξης</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Διακοπή διαμοιρασμού</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Δυνατότητα δημιουργίας</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Μπορεί να αλλάξει</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Μπορεί να διαγράψει</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Προστασία με συνθηματικό</translation>
</message>
@@ -4520,13 +4550,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Επιλέξτε νέα τοποθεσία…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Μοιράστηκα κάτι μαζί σου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Επιλογές κοινής χρήσης</translation>
</message>
@@ -4536,79 +4566,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Διαμοιρασμός μέσω %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Αντιγραφή ιδιωτικού συνδέσμου στο πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Αποστολή ιδιωτικού συνδέσμου με αλληλογραφία...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Δεν επιτρέπεται ο επαναδιαμοιρασμός</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Δεν επιτρέπεται η αναδημοσίευση αυτού του φακέλου.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Αντιγραφή δημόσιου συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Αντιγραφή εσωτερικού συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Επεξεργασία</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Άνοιγμα στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Επίλυση διένεξης…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Μετακίνηση και μετονομασία...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Μετακίνηση, μετονομασία και μεταφόρτωση ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Διαγραφή τοπικών αλλαγών</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Μετακίνηση και μεταφόρτωση ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Διαγραφή</translation>
</message>
@@ -5184,29 +5235,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Προσθήκη λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Άνοιγμα κύριου διαλόγου</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Συνέχιση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Ρυθμίσεις</translation>
</message>
@@ -5216,22 +5267,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Έξοδος %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Παύση συγχρονισμού για όλους</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Συνέχιση συγχρονισμού για όλους</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5239,24 +5290,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Εφαρμογή Υπολογιστή %1 &lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Έκδοση %1. Για περισσότερες πληροφορίες δείτε &lt;a href=&apos;%2&apos;&gt;εδώ&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Η έκδοση παρέχεται από %1&lt;/p&gt;</translation>
</message>
@@ -5264,22 +5315,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5287,7 +5338,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Επανάληψη όλων των μεταφορτώσεων</translation>
</message>
@@ -5320,22 +5371,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Αφαίρεση σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Ακύρωση</translation>
</message>
@@ -5997,7 +6048,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Νέος φάκελος</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6106,7 +6157,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Αποτυχία σύνδεσης με βάση δεδομένων.</translation>
</message>
@@ -6127,7 +6178,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6151,7 +6202,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6189,7 +6240,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ο λογαριασμός δεν συνδέθηκε</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Δραστηριότητα λογαριασμού</translation>
</message>
@@ -6199,18 +6250,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Αφαίρεση λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Ορισμός κατάστασης</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Είσοδος</translation>
@@ -6224,52 +6275,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Κατάσταση σε σύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Σε σύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Μην ενοχλείτε</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Αόρατος</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Μήνυμα κατάστασης</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Ποια είναι η κατάστασή σας;</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Εκκαθάριση μηνύματος κατάστασης μετά από</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Εκκαθάριση μηνύματος κατάστασης</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Ορισμός μηνύματος κατάστασης</translation>
</message>
@@ -6355,12 +6406,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Το ληφθέν αρχείο δεν ταιριάζει με το άθροισμα ελέγχου, θα επαναληφθεί. &apos;% 1&apos;! = &apos;% 2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6368,98 +6419,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Κύριος διάλογος της επιφάνειας εργασίας Nextcloud.</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Τρέχον λογαριασμός</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Συνέχιση όλων των συγχρονισμών</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Παύση όλων των συγχρονισμών</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Ορισμός κατάστασης χρήστη</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Προσθήκη λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Προσθήκη νέου λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Ρυθμίσεις</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Έξοδος</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Τρέχων avatar χρήστη</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Μενού εναλλαγής λογαριασμού και ρυθμίσεων.</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Άνοιγμα τοπικού φακέλου του τρέχων λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Συνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Άνοιγμα του Nextcloud Talk με το πρόγραμμα περιήγησης.</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Περισσότερες εφαρμογές</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Μενού εφαρμογών</translation>
@@ -6480,7 +6526,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Άνοιγμα του διαλόγου διαμοιρασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Περισσότερες εφαρμογές</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
@@ -6491,7 +6542,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Εμφάνιση περισσότερων ενεργειών.</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6501,7 +6552,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Κοινή χρήση %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6527,7 +6578,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Δημιουργήθηκε από την διασκευή Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; στο %3, %4 χρησιμοποιώντας Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index abe81006b..2fd4e7d21 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>End to end encryption mnemonic</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</translation>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Signed out</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Disconnected</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Connected</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Service unavailable</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Maintenance mode</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Network error</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Configuration error</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Asking Credentials</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Unknown account state</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error accessing the configuration file</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Quit %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation>The server file discovery reply is missing data.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1939,12 +1956,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Add Folder Sync Connection</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Add Sync Connection</translation>
</message>
@@ -1962,7 +1979,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Enter the path to the local folder.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Select the source folder</translation>
</message>
@@ -1970,7 +1987,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Create Remote Folder</translation>
</message>
@@ -1980,47 +1997,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Enter the name of the new folder to be created below &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Folder was successfully created on %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Authentication failed accessing %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Failed to create the folder on %1. Please check manually.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Failed to list a folder. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Choose this to sync the entire account</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>This folder is already being synced.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2028,24 +2045,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2066,27 +2083,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No E-Tag received from server, check Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We received a different E-Tag for resuming. Retrying next time.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server returned wrong content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Connection Timeout</translation>
</message>
@@ -2135,83 +2152,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Updates</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Restart &amp;&amp; Update</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Advanced</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Ask for confirmation before synchronising folders larger than</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Ask for confirmation before synchronising external storages</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Show sync folders in &amp;Explorer&apos;s Navigation Pane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>S&amp;how crash reporter</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Edit &amp;Ignored Files</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Server notifications that require attention.</translation>
</message>
@@ -2221,49 +2240,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2619,7 +2638,7 @@ Logs will be written to %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2629,7 +2648,7 @@ Logs will be written to %1</translation>
<translation>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3511,12 +3530,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3531,22 +3550,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3556,47 +3575,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3606,7 +3625,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3647,44 +3666,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>File %1 can not be downloaded because encryption information is missing.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>File has changed since discovery</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>File %1 can not be downloaded because of a local file name clash!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>The download would reduce free local disk space below the limit</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Free space on disk is less than %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>File was deleted from server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>The file could not be downloaded completely.</translation>
</message>
@@ -3694,12 +3713,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>File %1 cannot be saved because of a local file name clash!</translation>
</message>
@@ -3709,18 +3728,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error writing metadata to the database</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4107,7 +4126,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Dismiss</translation>
</message>
@@ -4154,32 +4173,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud Path:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Icon</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>share label</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Folder: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Sharing</translation>
</message>
@@ -4189,17 +4219,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>The file can not be shared because it was shared without sharing permission.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4212,7 +4242,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Password:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4222,7 +4252,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4237,7 +4267,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Expiration date:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Set password</translation>
</message>
@@ -4247,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Expires:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4342,27 +4372,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirm Link Share Deletion</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Delete</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Public link</translation>
</message>
@@ -4370,7 +4400,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4380,7 +4410,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copy link</translation>
</message>
@@ -4390,22 +4420,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No results for &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>I shared something with you</translation>
</message>
@@ -4413,7 +4443,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4423,62 +4453,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>can edit</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Can reshare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Can create</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Can change</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Can delete</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4505,13 +4535,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>I shared something with you</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4521,79 +4551,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copy private link to clipboard</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Resharing this file is not allowed</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Open in browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Delete</translation>
</message>
@@ -5169,29 +5220,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Add account</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Settings</translation>
</message>
@@ -5201,22 +5252,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5224,24 +5275,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</translation>
</message>
@@ -5249,22 +5300,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5272,7 +5323,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5305,22 +5356,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5982,7 +6033,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6091,7 +6142,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6112,7 +6163,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6136,7 +6187,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6174,7 +6225,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Account actions</translation>
</message>
@@ -6184,18 +6235,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Log out</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Log in</translation>
@@ -6209,52 +6260,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6340,12 +6391,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6353,98 +6404,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Current account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Add account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Settings</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Exit</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Connected</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Disconnected</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>More apps</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6465,7 +6511,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>More apps</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
@@ -6476,7 +6527,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6486,7 +6537,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6512,7 +6563,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_eo.ts b/translations/client_eo.ts
index 4924f36e4..edacd93fc 100644
--- a/translations/client_eo.ts
+++ b/translations/client_eo.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Memorigilo por tutvoja ĉifrado</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Por protekti vian ĉifran identecon, ni ĉifras ĝin kun memorigilo de 12 vortoj el la vortaro. Bv. noti tiujn kaj gardi tion en sekura loko. Vi bezonos ilin por aldoni aliajn aparatojn al via konto (kiel via poŝtelefono aŭ via portebla komputilo).</translation>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Elsalutita</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Malkonektita</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Konektita</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servo nedisponebla</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Reĝimo de prizorgado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Reta eraro</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Agorda eraro</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Akreditiloj petitaj</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Konto-stato nekonita</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Eraro dum aliro al la dosiero de agordoj</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Okazis eraro dum aliro al la agorda dosiero en %1. Bv. certigi, ke la dosiero estas alirebla de via uzanto.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Fini %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation>La servila respondo pri dosiera malkovro havas mankantajn datumojn.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1947,12 +1964,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Aldoni dosierujan sinkronigon</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Aldoni sinkronigon</translation>
</message>
@@ -1970,7 +1987,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Entajpi la vojon al la loka dosierujo</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Elekti la fontan dosierujon</translation>
</message>
@@ -1978,7 +1995,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Krei foran dosierujon</translation>
</message>
@@ -1988,47 +2005,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Entajpu la nomon de la nova dosierujo kreota en „%1“:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Dosierujo sukcese kreita en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Aŭtentigo malsukcesis dum aliro al %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Malsukcesis krei la dosierujon en %1. Bv. kontroli permane.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Ne eblis listigi dosierujon. Eraro: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Elektu tion ĉi por sinkronigi la tutan konton</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Tiu ĉi dosierujo jam estas sinkroniganta.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Vi jam estas sinkroniganta &lt;i&gt;%1&lt;/i&gt;, kio estas patra dosierujo de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2036,24 +2053,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2074,27 +2091,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Neniu „E-Tag“ ricevita el la servilo, kontrolu la prokurilon kaj la kluzon</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ni ricevis malsaman „E-Tag“ por rekomenci. Reprovo venontfoje.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>La servilo sendis neĝustan enhavintervalon („content-range“)</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Konekto eltempiĝis</translation>
</message>
@@ -2143,83 +2160,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Ĝisdatigoj</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Restarti kaj ĝisdatigi</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Detalaj agordoj</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Demandi antaŭ ol sinkronigi dosierujon pli grandajn ol</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Demandi antaŭ ol sinkronigi dosierujon el ekstera konservejo</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Montri sinkronigitajn &amp;dosierujojn en la naviga panelo de la dosiera foliumilo</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Montri &amp;kraŝraportilon</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Redakti &amp;ignoritajn dosierojn</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Servilaj sciigoj, kiu bezonas atenton.</translation>
</message>
@@ -2229,49 +2248,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2629,7 +2648,7 @@ Protokoloj estos skribataj al %1.</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Eraro</translation>
</message>
@@ -2639,7 +2658,7 @@ Protokoloj estos skribataj al %1.</translation>
<translation>&lt;nobr&gt;Dosiero „%1“&lt;br/&gt;ne eblis malfermiĝi.&lt;br/&gt;&lt;br/&gt;La eligo de la protokolo &lt;b&gt;ne&lt;/b&gt; povas esti konservita!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3520,12 +3539,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3540,22 +3559,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3565,47 +3584,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3615,7 +3634,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3656,44 +3675,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Dosiero %1 ne elŝuteblis, ĉar ĉifra informo mankas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Dosiero ŝanĝiĝis ekde sia malkovro</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Dosiero %1 ne elŝuteblis, ĉar estas konflikto kun loka dosiernomo!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Tiu elŝuto malpligrandigus la liberan lokan diskospacon.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Libera diskospaco estas malpli ol %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Dosiero estis forigita el la servilo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>La dosiero ne estis elŝutita plene.</translation>
</message>
@@ -3703,12 +3722,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>La elŝutita dosiero malplenas, kvankam la servilo anoncis, ke ĝi estos %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Dosiero %1 ne eblis esti konservita pro konflikto kun loka dosiernomo!</translation>
</message>
@@ -3718,18 +3737,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Eraro dum konservado de pridatumoj en la datumbazo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4116,7 +4135,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Ignori</translation>
</message>
@@ -4163,32 +4182,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud-vojo:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Piktogramo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>kunhava etikedo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud-vojo:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Dosierujo: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Kunhavigo %1</translation>
</message>
@@ -4198,17 +4228,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>La dosiero ne eblis esti kunhavigita, ĉar ĝi estis kunhavigita sen permeso de re-kunhavigo.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4221,7 +4251,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Pasvorto:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Kunhavigi ligilon</translation>
</message>
@@ -4231,7 +4261,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Noto:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4246,7 +4276,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Limdato:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4256,7 +4286,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Senvalidiĝas:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4351,27 +4381,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Forigi kunhavo-ligilon</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Konfirmi forigon de kunhava ligilo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ĉu vi ja volas forigi la kunhavigon per publika ligilo &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Notu: tio ne povas esti malfarita.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Forigi</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Nuligi</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Publika ligilo</translation>
</message>
@@ -4379,7 +4409,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4389,7 +4419,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopii ligilon</translation>
</message>
@@ -4399,22 +4429,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Neniu rezulto por „%1“</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Mi kunhavigis ion kun vi</translation>
</message>
@@ -4422,7 +4452,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4432,62 +4462,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>povas redakti</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Eblas rekunhavigi</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Malkunhavigi</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Povas krei</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Eblas ŝanĝi</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Povas forigi</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4514,13 +4544,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Mi kunhavigis ion kun vi</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opcioj pri kunhavigo</translation>
</message>
@@ -4530,79 +4560,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopii privatan ligilon al tondujo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Re-kunhavigi ne estas permesata</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopii publikan ligilon</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopii internan ligilon</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Malfermi per retumilo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Forigi</translation>
</message>
@@ -5177,29 +5228,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Aldoni konton</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Agordoj</translation>
</message>
@@ -5209,22 +5260,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5232,24 +5283,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versio %1. Por pli da informoj, alklaku &lt;a href=&apos;%2&apos;&gt;ĉi tie&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Tiu eldono estis liverita de %1&lt;/p&gt;</translation>
</message>
@@ -5257,22 +5308,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5280,7 +5331,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5313,22 +5364,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5990,7 +6041,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6099,7 +6150,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6120,7 +6171,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6144,7 +6195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6182,7 +6233,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6192,18 +6243,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Elsaluti</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Ensaluti</translation>
@@ -6217,52 +6268,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6348,12 +6399,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6361,98 +6412,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Nuna konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Aldoni konton</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Agordoj</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Konektita</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Malkonektita</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Pli da aplikaĵoj</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6473,7 +6519,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Pli da aplikaĵoj</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Malfermi %1 per la retumilo</translation>
</message>
@@ -6484,7 +6535,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6494,7 +6545,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6520,7 +6571,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Konstruita el Git-a revizio &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; je %3, %4, uzante Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index cc351c59a..45c95aa9b 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Abrir %1 localmente</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>En %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Abrir diálogo de compartir</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Regla mnemotécnica del cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Para proteger tu identidad criptográfica, la ciframos con una regla mnemotécnica de 12 palabras del diccionario. Por favor, anótalas y mantenlas a salvo. Estas palabras serán necesarias para añadir otros dispositivos a su cuenta (como un teléfono móvil o un portátil). </translation>
</message>
@@ -734,47 +752,47 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error en la red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error en la configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de cuenta desconocido</translation>
</message>
@@ -782,17 +800,17 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Para más detalles, por favor, abre la app Actividades.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Los archivos de la lista de ignorados así como los enlace simbólicos no estarán sincronizados.</translation>
</message>
@@ -853,42 +871,42 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Continuar significará &lt;b&gt;eliminar estos ajustes&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Continuar significará &lt;b&gt;ignorar estos ajustes&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Algunos ajustes fueron configurados en nuevas versiones de este cliente y usan características que no están disponibles en esta versión.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Ya se ha hecho una copia de seguridad del archivo de configuración a &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder al archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Se ha producido un error al acceder al archivo de configuración en %1. Por favor asegúrese de que el archivo es accesible por su usuario.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Salir %1</translation>
</message>
@@ -930,7 +948,6 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>El archivo %1 tiene una hora de modificación no válida. No subir al servidor.</translation>
</message>
@@ -1203,8 +1220,8 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<translation>A la respuesta de descubrimiento de archivos del servidor le faltan datos.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Error del servidor: ¡la respuesta de PROPFIND no tiene formato XML!</translation>
</message>
@@ -1962,12 +1979,12 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Añadir conexión para el directorio de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Añadir conexión de sincronización</translation>
</message>
@@ -1985,7 +2002,7 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<translation>Introduzca la ubicación de la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Seleccione la carpeta de origen</translation>
</message>
@@ -1993,7 +2010,7 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crear carpeta remota</translation>
</message>
@@ -2003,47 +2020,47 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<translation>Introduzca más abajo el nombre de la nueva carpeta a crear &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Introduce el nombre de la nueva carpeta que se creará debajo de &quot;%1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta ha sido creada con éxito en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Fallo de autenticación al acceder a %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Fallo al listar una carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Elija esto para sincronizar la cuenta entera</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya se ha sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya ha sincronizado &lt;i&gt;%1&lt;/i&gt;, el cual es la carpeta de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una subcarpeta de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2051,24 +2068,24 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Usa archivos virtuales en vez de descargar el contenido inmediatamente %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Los archivos virtuales no son compatibles con la carpeta raíz de la partición de Windows como carpeta local. Por favor, elija una subcarpeta válida bajo la letra de la unidad.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Los archivos virtuales no están disponibles para la carpeta seleccionada</translation>
</message>
@@ -2089,27 +2106,27 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se ha recibido ninguna E-Tag del servidor, revise el proxy/puerta de enlace</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se ha recibido una E-Tag distinta para reanudar. Se volverá a intentar.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Hemos recibido una longitud inesperada de contenido de la descarga.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor ha devuelto un content-range erróneo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -2158,83 +2175,85 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Comprobar actualizaciones automáticamente</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Channel</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stable</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reiniciar &amp;&amp; Actualizar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Comprobar ahora las actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Preguntar si se desea sincronizar carpetas mayores de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Preguntar si se desea sincronizar carpetas de almacenamiento externo</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Mostrar carpetas sincronizadas en el panel de navegación del explorador</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el informe de fallos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar archivos &amp;ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Crear Archivo de Depuración …</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Notificaciones del servidor que requieren atención.</translation>
</message>
@@ -2244,17 +2263,17 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>No puedes desactivar el inicio automático porque el inicio automático de todo el sistema está activado.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>¿Cambiar el canal de actualización?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2263,32 +2282,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Tenga en cuenta que esto sólo selecciona de qué grupo se tomarán las actualizaciones, y que no hay vuelta atrás: Por lo tanto volver del canal &quot;beta&quot; al canal &quot;estable&quot; normalmente no puede hacerse inmediatamente y significa esperar a una versión estable que sea más reciente que la versión beta instalada actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Cambiar canal de actualización</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Crear archivo de depuración</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Archivos Zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Archivo de depuración creado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>El archivo de depuración se ha creado en %1</translation>
</message>
@@ -2649,7 +2668,7 @@ Los registros se guardarán en: %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2659,7 +2678,7 @@ Los registros se guardarán en: %1</translation>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt;no se puede abrir para escritura.&lt;br/&gt;&lt;br/&gt;¡El archivo de registro &lt;b&gt;no&lt;/b&gt; se puede guardar!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;El archivo &quot;%1&quot;&lt;br/&gt;no se puede abrir para escritura.&lt;br/&gt;&lt;br/&gt;¡El archivo de registro &lt;b&gt;no se puede&lt;/b&gt; guardar!&lt;/nobr&gt;</translation>
</message>
@@ -3547,12 +3566,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>El nombre del archivo está prohibido en el servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>El archivo tiene una extensión reservada para archivos virtuales.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>tamaño</translation>
</message>
@@ -3567,22 +3586,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>el servidor informó de no %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>permisos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>identificador de archivo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>El servidor informó de no %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3592,47 +3611,47 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Se ha producido un conflicto al subir algunos archivos a una carpeta. ¡Se eliminarán los conflictivos!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Se ha producido un conflicto al subir una carpeta. ¡Se eliminará!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Se ha producido un conflicto al subir un archivo. ¡Se eliminará!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de «elija qué va a sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>No permitido porque no tienes permiso para añadir subcarpetas a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>No permitido porque no tienes permiso para añadir archivos a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido a un lugar no válido, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Error mientras se leía la base de datos</translation>
</message>
@@ -3642,7 +3661,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>El servidor contestó con un error al leer el directorio «%1» : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>El servidor contestó con un error al leer el directorio &quot;%1&quot; : %2</translation>
</message>
@@ -3683,44 +3702,44 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>El archivo %1 no se ha podido descargar porque falta la información de cifrado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>El archivo %1 no puede ser descargado porque falta la información de cifrado,</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no se pudo descargar a causa de un conflicto con el nombre de un archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reducirá el espacio libre local por debajo del límite.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio libre en el disco es inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Se ha eliminado el archivo del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>No se ha podido descargar el archivo completamente.</translation>
</message>
@@ -3730,12 +3749,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>El archivo descargado está vacío a pesar de que el servidor comunicó que debería haber sido %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>El archivo descargado está vacío, aunque el servidor dijo que debía ocupar %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede guardarse debido a un conflicto con el nombre de otro archivo local!</translation>
</message>
@@ -3745,18 +3764,18 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>El servidor informa que el archivo %1 tiene una hora de modificación no válida. No lo guardes.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
@@ -4143,7 +4162,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4190,32 +4209,43 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Ruta de OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Icono</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>Compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Ruta de Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Etiqueta de texto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4225,17 +4255,17 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>El archivo no puede compartirse ya que ha sido compartido sin los permisos correspondientes.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>El archivo no se puede compartir porque no dispone de permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Por favor, introduce una contraseña para tu enlace compartido:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Se requiere contraseña para compartir</translation>
</message>
@@ -4248,7 +4278,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Contraseña:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Compartir enlace</translation>
</message>
@@ -4258,7 +4288,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Nota</translation>
</message>
@@ -4273,7 +4303,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Fecha de caducidad:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4283,7 +4313,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Caduca:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Caduca</translation>
</message>
@@ -4378,27 +4408,27 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Eliminar enlace compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar eliminación de enlace de recurso compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente desea borrar el enlace público compartido &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Nota: Esta acción no se puede deshacer&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Enlace público</translation>
</message>
@@ -4406,7 +4436,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Compartir con usuarios o grupos ...</translation>
</message>
@@ -4416,7 +4446,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Buscar globalmente</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copiar enlace</translation>
</message>
@@ -4426,22 +4456,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>No hay resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Sin resultados para &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Se requiere contraseña para compartir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Por favor, introduce una contraseña para tu enlace compartido por email:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>He compartido algo contigo</translation>
</message>
@@ -4449,7 +4479,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Usuario</translation>
</message>
@@ -4459,62 +4489,62 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Contraseña:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Caduca:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Puede compartir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Nota para el destinatario</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Fijar fecha de caducidad</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>No compartir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Puede crear</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Puede cambiar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Puede eliminar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Protección por contraseña</translation>
</message>
@@ -4541,13 +4571,13 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Seleccione nueva ubicación …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>He compartido algo contigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opciones de compartir</translation>
</message>
@@ -4557,79 +4587,100 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Compartir vía %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar enlace privado al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Enviar enlace privado por correo electrónico ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>No está permitido compartir de nuevo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>No está permitido compartir de nuevo esta carpeta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiar enlace público</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copiar enlace interno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Editar</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Abrir en navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Resolver conflicto …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Mover y renombrar …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Mover, renombrar y subir …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Borra cambios en local</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Mover y subir …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
@@ -5205,29 +5256,29 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Abrir diálogo principal</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Continuar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Ajustes</translation>
</message>
@@ -5237,22 +5288,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Salir %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pausar sincronización a todos</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Continuar sincronización a todos</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5260,24 +5311,24 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 - Cliente de escritorio&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versión %1. Para obtener más información, haga clic &lt;a href=&apos;%2&apos;&gt; aquí &lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Usando el plugin de archivos virtuales: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Esta versión ha sido suministrada por %1&lt;/p&gt;</translation>
</message>
@@ -5285,22 +5336,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Fallo al recuperar los proveedores.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Fallo al recuperar los proveedores de búsqueda para &apos;%1&apos;. Error: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>La búsqueda ha fallado para &apos;%2&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>La búsqueda ha fallado para &apos;%1&apos;. Error: %2</translation>
</message>
@@ -5308,7 +5359,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Reintentar todas las subidas</translation>
</message>
@@ -5341,22 +5392,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Confirma la eliminación de cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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 quieres eliminar la conexión con la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Esto &lt;b&gt;no eliminará&lt;/b&gt; ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Eliminar vinculación</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -6018,7 +6069,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Nueva carpeta</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Marcar como leído</translation>
</message>
@@ -6127,7 +6178,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Fallo en la conexión a la base de datos.</translation>
</message>
@@ -6148,7 +6199,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Buscando archivos, mensajes, eventos …</translation>
</message>
@@ -6172,7 +6223,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Cargar más resultados</translation>
</message>
@@ -6210,7 +6261,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Cuenta no conectada</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6220,18 +6271,18 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Eliminar Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Establecer estado</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6245,52 +6296,52 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Estado en línea</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>En línea</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Ausente</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>No molestar</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Invisible</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>¿Cuál es su estado?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Borrar el mensaje de estado después de</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Borrar el mensaje de estado</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Establecer un mensaje de estado</translation>
</message>
@@ -6376,12 +6427,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>El archivo descargado no coincide con la suma de comprobación (checksum), será reanudado. «%1» != «%2»</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>El encabezado del checksum contenía un tipo de comprobación desconocido: &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>El archivo descargado no coincide con la suma de comprobación (checksum), se reanudará. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6389,98 +6440,93 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Cuadro de diálogo principal de escritorio de Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Continuar sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pausar sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Cambiar el estado del usuario</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Añadir cuenta nueva</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar del usuario actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>El estado actual del usuario es en línea</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>El estado actual del usuario es no molestar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Cambiador de cuentas y menú de configuración</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Abrir carpeta local de la cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Abrir Nextcloud Talk en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menú de apps</translation>
@@ -6501,7 +6547,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Abrir diálogo de compartir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6512,7 +6563,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Mostrar más acciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Unificar la lista de resultados de la búsqueda</translation>
</message>
@@ -6522,7 +6573,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>Comparte %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Actividad del archivo</translation>
</message>
@@ -6548,7 +6599,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Construido desde la revisión Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; en %3, %4, usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index e86b08668..bfa846649 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Desautentificado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Pidiendo Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta desconocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1929,12 +1946,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation type="unfinished"/>
</message>
@@ -1952,7 +1969,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingrese el path al directorio local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Seleccioná el directorio origen</translation>
</message>
@@ -1960,7 +1977,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crear carpeta remota</translation>
</message>
@@ -1970,47 +1987,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>El directorio fue creado con éxito en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autenticación fallida accediendo a %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Fallo al crear el directorio en %1. Por favor chequee manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Fallo al listar carpetas. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Seleccioná acá para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Este folder ya está siendo sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, el cual es el directorio de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2018,24 +2035,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2056,27 +2073,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -2125,83 +2142,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2211,49 +2230,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2605,7 +2624,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2615,7 +2634,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt;no puede ser abierto para escritura.&lt;br/&gt;&lt;br/&gt;¡El archivo de log &lt;b&gt;no&lt;/b&gt; puede ser guardado!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3496,12 +3515,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3516,22 +3535,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3541,47 +3560,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3591,7 +3610,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3632,44 +3651,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
@@ -3679,12 +3698,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3694,18 +3713,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error escribiendo metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4092,7 +4111,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -4139,32 +4158,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
@@ -4174,17 +4204,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4197,7 +4227,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4207,7 +4237,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4222,7 +4252,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4232,7 +4262,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4327,27 +4357,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation type="unfinished"/>
</message>
@@ -4355,7 +4385,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4365,7 +4395,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4375,22 +4405,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
@@ -4398,7 +4428,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4408,62 +4438,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>podés editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4490,13 +4520,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4506,79 +4536,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiar link publico</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
@@ -5152,29 +5203,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Ajustes</translation>
</message>
@@ -5184,22 +5235,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5207,24 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5232,22 +5283,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5255,7 +5306,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5288,22 +5339,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5965,7 +6016,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6074,7 +6125,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6095,7 +6146,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6119,7 +6170,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6157,7 +6208,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6167,18 +6218,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Cerrar la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6192,52 +6243,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6323,12 +6374,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6336,98 +6387,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6448,7 +6494,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
@@ -6459,7 +6510,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6495,7 +6546,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts
index 55b6ec595..8c2193c99 100644
--- a/translations/client_es_CL.ts
+++ b/translations/client_es_CL.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts
index 4de77db14..2164b2581 100644
--- a/translations/client_es_CO.ts
+++ b/translations/client_es_CO.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Compartir enlace</translation>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts
index 739d3235d..173545102 100644
--- a/translations/client_es_CR.ts
+++ b/translations/client_es_CR.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts
index d221d974e..312b6c518 100644
--- a/translations/client_es_DO.ts
+++ b/translations/client_es_DO.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts
index 9a3c18a9a..e91612fb5 100644
--- a/translations/client_es_EC.ts
+++ b/translations/client_es_EC.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts
index 3dd6c1c95..41c2dd996 100644
--- a/translations/client_es_GT.ts
+++ b/translations/client_es_GT.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts
index 081431504..a5fcd5937 100644
--- a/translations/client_es_HN.ts
+++ b/translations/client_es_HN.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts
index 66a20b7a6..9066db77a 100644
--- a/translations/client_es_MX.ts
+++ b/translations/client_es_MX.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiar enlace público</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts
index 33a29d113..7c3f77f09 100644
--- a/translations/client_es_SV.ts
+++ b/translations/client_es_SV.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1936,12 +1953,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agregar Conexión de Carpeta de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agregar Conexión de Sincronización</translation>
</message>
@@ -1959,7 +1976,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa la ruta a la carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecciona la carpeta fuente</translation>
</message>
@@ -1967,7 +1984,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea la Carpeta Remota</translation>
</message>
@@ -1977,47 +1994,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ingresa el nombre de la nueva carpeta a crear en la parte inferior &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La carpeta se creó exitosamente en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>La autenticación fallo al acceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Se presentó una falla al crear la carpeta en %1. Por favor verifica manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Se presentó una falla al enlistar la carpeta. Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selecciona esta opción para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta carpeta ya está siendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, que es una carpeta padre de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2025,24 +2042,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2063,27 +2080,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió un E-Tag del servidor, verifica el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibimos una E-Tag diferente para reanudar. Reintentando la proxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>El servidor regreso un rango de contenido equivocado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>El tiempo de la conexión expiró</translation>
</message>
@@ -2132,83 +2149,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reinicia &amp;&amp; Actualiza</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmación antes de sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Perdir confirmaci´pón antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar el reporteador de fallas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Archivos &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2218,49 +2237,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt; no se puede abrir para escritura. &lt;br/&gt;&lt;br/&gt; ¡La salida de la bitácora &lt;b&gt;no&lt;/b&gt;puede ser guardada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3504,12 +3523,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3524,22 +3543,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3549,47 +3568,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3599,7 +3618,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3640,44 +3659,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reduciría el espacio local disponible por debajo del límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio disponible en disco es menos del 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>El archivo fue borrado del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>El archivo no pudo ser descargado por completo. </translation>
</message>
@@ -3687,12 +3706,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation>
</message>
@@ -3702,18 +3721,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4100,7 +4119,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -4147,32 +4166,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ruta de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtiquetaDeTexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
@@ -4182,17 +4212,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>El archivo no puede ser compartido porque fue compartido sin permisos para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4205,7 +4235,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4215,7 +4245,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4230,7 +4260,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
@@ -4240,7 +4270,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4335,27 +4365,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas borrar el vínculo público al elemento &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;Nota: Esta acción no se puede deshacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Liga pública</translation>
</message>
@@ -4363,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4373,7 +4403,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4383,22 +4413,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>No se encontraron resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartí algo contigo</translation>
</message>
@@ -4406,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4416,62 +4446,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>puede editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4498,13 +4528,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4514,79 +4544,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
@@ -5162,29 +5213,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
@@ -5194,22 +5245,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5217,24 +5268,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5242,22 +5293,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5265,7 +5316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5298,22 +5349,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5975,7 +6026,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6084,7 +6135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6105,7 +6156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6167,7 +6218,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Acciones de la cuenta</translation>
</message>
@@ -6177,18 +6228,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Salir de la sesión</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
@@ -6202,52 +6253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6333,12 +6384,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6346,98 +6397,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configuraciones </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Más aplicaciones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6458,7 +6504,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Más aplicaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
@@ -6469,7 +6520,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6505,7 +6556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 7f9a45314..2c5646f70 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Välja logitud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Lahti ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Teenus pole saadaval</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Võrgu viga</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Seadistamise tõrge</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Tundmatu konto olek</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1929,12 +1946,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation type="unfinished"/>
</message>
@@ -1952,7 +1969,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Sisesta otsingutee kohaliku kataloogini.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Vali algne kaust</translation>
</message>
@@ -1960,7 +1977,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Loo kaugkaust</translation>
</message>
@@ -1970,47 +1987,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>%1 - kaust on loodud.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Kausta loomine ebaõnnestus - %1. Palun kontrolli käsitsi.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Vali see sünkroniseering tervele kontole</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Seda kataloogi juba sünkroniseeritakse.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sa juba sünkroniseerid &lt;i&gt;%1&lt;/i&gt;, mis on &lt;i&gt;%2&lt;/i&gt; ülemkataloog.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2018,24 +2035,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2056,27 +2073,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server tagastas vale vahemiku</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -2125,83 +2142,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Uuendused</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Taaskäivita &amp;&amp; Uuenda</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Täpsem</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>&amp;Näita kokkujooksmise teavitajat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Muuda &amp;ignoreeritud faile</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2211,49 +2230,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2605,7 +2624,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Viga</translation>
</message>
@@ -2615,7 +2634,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Faili &apos;%1&apos;&lt;br/&gt;ei saa kirjutamiseks avada.&lt;br/&gt;&lt;br/&gt;Logi väljundit &lt;b&gt;ei saa&lt;/b&gt; salvestada!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3496,12 +3515,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3516,22 +3535,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3541,47 +3560,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3591,7 +3610,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3632,44 +3651,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Faili on pärast avastamist muudetud</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Fail on serverist kustutatud</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Faili täielik allalaadimine ebaõnnestus.</translation>
</message>
@@ -3679,12 +3698,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
</message>
@@ -3694,18 +3713,18 @@ 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/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4092,7 +4111,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Jäta vahele</translation>
</message>
@@ -4139,32 +4158,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloudi kaust:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>jagamise silt</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Tekstisilt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Kaust: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 jagamine</translation>
</message>
@@ -4174,17 +4204,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4197,7 +4227,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4207,7 +4237,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4222,7 +4252,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Määra parool</translation>
</message>
@@ -4232,7 +4262,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4327,27 +4357,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Kustuta jagamise link</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Kustuta</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Loobu</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Avalik link</translation>
</message>
@@ -4355,7 +4385,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4365,7 +4395,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4375,22 +4405,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
@@ -4398,7 +4428,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4408,62 +4438,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>saab muuta</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4490,13 +4520,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4506,79 +4536,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopeeri avalik link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Kustuta</translation>
</message>
@@ -5154,29 +5205,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Lisa konto</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Seaded</translation>
</message>
@@ -5186,22 +5237,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5209,24 +5260,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5234,22 +5285,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5257,7 +5308,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5290,22 +5341,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5967,7 +6018,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6076,7 +6127,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6097,7 +6148,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6121,7 +6172,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6159,7 +6210,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6169,18 +6220,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Logi välja</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Logi sisse</translation>
@@ -6194,52 +6245,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6325,12 +6376,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6338,98 +6389,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Lisa konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Seaded</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Lahti ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Veel rakendusi</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6450,7 +6496,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Veel rakendusi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
@@ -6461,7 +6512,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6471,7 +6522,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6497,7 +6548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index bc1f41dca..e479a8548 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Ireki %1 lokalean</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>%1 -n</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Baztertu</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Ireki partekatzeko elkarrizketa-koadroa</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Amaitu muturretik muturrerako zifratzea</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Zure nortasun kriptografikoa babesteko, hiztegietako 12 hitzen mnemoniko batekin zifratzen dugu. Mesedez, kontuan hartu horiek eta gorde itzazu. Beharrezkoak izango dira zure kontuan beste gailu batzuk gehitzeko (telefono mugikorra edo ordenagailu eramangarria adibidez).</translation>
</message>
@@ -734,47 +752,47 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Saioa bukatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Zerbitzua ez dago eskuragarri</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Mantenu lanetan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Sare errorea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Konfigurazio errorea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Kredentzialak eskatzen</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Kontuaren egoera ezezaguna</translation>
</message>
@@ -782,17 +800,17 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Jarduera gehiagorako ireki Jarduerak aplikazioa.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Ez ikusi zerrendako fitxategiak eta esteka sinbolikoak ez dira sinkronizatuko.</translation>
</message>
@@ -853,42 +871,42 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Jarraitzeak &lt;b&gt;ezarpen horiek ezabattzea&lt;/b&gt; supostuko du.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Jarraitzeak &lt;b&gt;ezarpen horiek ez ikustea&lt;/b&gt;suposatuko du.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ezarpen batzuk bezero honen bertsio berriagoetan konfiguratu ziren eta bertsio honetan erabilgarri ez dauden funtzioak erabiltzen dituzte.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Uneko konfigurazio fitxategiaren babeskopia egin zen&lt;i&gt;%2&lt;/i&gt;-ra.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Irten</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Jarraitu</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Errorea ezarpen fitxategia atzitzean</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>% 1 konfigurazio fitxategian sartzean akats bat gertatu da. Egiaztatu zure erabiltzaileak fitxategi hau atzitzeko baimena duela.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>%1etik Irten</translation>
</message>
@@ -930,7 +948,6 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>%1 fitxategiak aldaketa-data baliogabea du. Ez igo hau zerbitzarira.</translation>
</message>
@@ -1203,8 +1220,8 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<translation>Zerbitzariaren fitxategiak bilatzeko erantzunean datuak falta dira.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Zerbitzariko errorea: PROPFINDaren erantzunak ez du XML formaturik!</translation>
</message>
@@ -1961,12 +1978,12 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Gehitu Karpeta Sinkronizatzeko Konexioa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Gehitu Sinkronizazio Konexioa</translation>
</message>
@@ -1984,7 +2001,7 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<translation>Sartu bertako karpeta berriaren bidea:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Hautatu jatorrizko karpeta</translation>
</message>
@@ -1992,7 +2009,7 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Sortu Urruneko Karpeta</translation>
</message>
@@ -2002,47 +2019,47 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<translation>Sartu behean sortuko den karpeta berriaren izena &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Idatzi &quot;% 1&quot; azpian sortuko den karpeta berriaren izena:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>%1-en karpeta ongi sortu da.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autentikazioak huts egin du %1en sartzean</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Huts egin du %1-(e)an karpeta sortzen. Egiaztatu eskuz.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Karpetaren zerrenda lortzeak huts egin du: Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Hautatu hau kontu osoa sinkronizatzeko</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Karpeta hau dagoeneko sinkronizatzen ari da.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Dagoeneko &lt;i&gt;%1&lt;/i&gt; sinkronizatzen ari zara, &lt;i&gt;%2&lt;/i&gt;-ren guraso karpeta dena.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Dagoeneko &lt;i&gt;%1&lt;/i&gt;sinkronizatzen ari zara, &lt;i&gt;%2&lt;/i&gt;-ren azpi-karpeta dena.</translation>
</message>
@@ -2050,24 +2067,24 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Erabili fitxategi birtualak edukia berehala deskargatu beharrean% 1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(esperimentala)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Fitxategi birtualak ez dira bateragarriak Windows partizio sustraiekin karpeta lokal bezala. Mesedez aukeratu baliozko azpikarpeta bat diskoaren letra azpian.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Fitxategi birtualak ez daude hautatutako karpetarentzako eskuragarri</translation>
</message>
@@ -2088,27 +2105,27 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Jarraitzeko E-Tag ezberdina jaso dugu. Hurrengoan saiatuko gara berriz.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Ustekabeko eduki-luzera deskarga jaso dugu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Zerbitzariak eduki-hein desegokia itzuli du</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
@@ -2157,83 +2174,85 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Eguneraketak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>A&amp;utomatikoki eguneraketak bilatu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanala</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>egonkorra</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>Be&amp;rrabiarazi eta Eguneratu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Eguneraketa oraintxe bilatu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Aurreratua</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Eskatu baimena handiagoak diren karpetak sinkronizatu baino lehen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Eskatu baimena kanpoko biltegiak sinkronizatu baino lehen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Erakutsi sinkronizatutako karpetak arakatzailearen &amp;nabigazio panelean</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Erakutsi &amp;kraskaduraren txostena</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editatu &amp;baztertutako fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Sortu arazketa fitxategia...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Arreta eskatzen duten zerbitzariaren jakinarazpenak.</translation>
</message>
@@ -2243,17 +2262,17 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Ezin da abiarazte automatikoa desgaitu sistema osoaren abiarazte automatikoa gaituta dagoelako.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Eguneratze kanala aldatu nahi duzu?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2262,32 +2281,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Kontuan izan honek bertsio berriak nondik hartu bakarrik hautatzen duela, ezin dela bertsio zaharretara itzuli: beraz, beta kanaletik batzuetan ezin da automatikoki kanal egonkorrera itzuli, jarrita dagoena baino berriagoa den bertsio egonkor bati itxaron behar zaio.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Aldatu eguneratze kanala</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Ezeztatu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Sortu arazketa fitxategia</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Arazketa fitxategia sortu da</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Arazketa fitxategia sortuta dago, hemen: %1</translation>
</message>
@@ -2647,7 +2666,7 @@ Erregistroak %1(e)an idatziko dira.</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Errorea</translation>
</message>
@@ -2657,7 +2676,7 @@ Erregistroak %1(e)an idatziko dira.</translation>
<translation>&lt;nobr&gt;&apos;%1&apos; Fitxategia&lt;br/&gt; ezin da idazteko ireki.&lt;br/&gt;&lt;br/&gt;Egunkariaren irteera &lt;b&gt;ezin&lt;/b&gt; da gorde!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;&quot;%1&quot; fitxategia&lt;br/&gt; ezin da ireki idazteko.&lt;br/&gt;&lt;br/&gt; Erregistroaren irteera &lt;b&gt;ezin da &lt;/b&gt; gorde!&lt;/nobr&gt;</translation>
</message>
@@ -3546,12 +3565,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Fitxategiaren izena zerrenda beltzean dago zerbitzarian.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Fitxategiak fitxategi birtualentzako gordetako luzapena du.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>tamaina</translation>
</message>
@@ -3566,22 +3585,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>zerbitzariak ez du %1-rik jakinarazi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>baimena</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>fitxategiaren id-a</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Zerbitzariak ez du %1-rik jakinarazi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Ezin da sinkronizatu aldaketa-ordu baliogabea delako</translation>
</message>
@@ -3591,47 +3610,47 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Gatazka gertatu da fitxategi batzuk karpetara kargatzean. Gatazka sortu dutenak garbitu egingo dira!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Gatazka gertatu da karpeta kargatzean. Garbituko da!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Gatazka gertatu da fitxategia kargatzean. Garbituko da!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ez ikusi egin zaio, &quot;aukeratu zer sinkronizatu&quot; zerrenda beltzagatik.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Ez da onartu, ez daukazulako baimenik karpeta horretan azpikarpetak gehitzeko</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Ez da onartu, ez daukazulako baimenik karpeta horretan fitxategiak gehitzeko</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ez dago baimenik fitxategi hau kargatzek zerbitzarian irakurtzeko soilik delako, leheneratzen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Baliogabeko helburura mugitu da, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Errorea datu-basea irakurtzean</translation>
</message>
@@ -3641,7 +3660,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Zerbitzariak errore batekin erantzun du irakurtzean &apos;%1&apos; : %2 direktorioa </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Zerbitzariak errore batekin erantzun du &quot;% 1&quot; direktorioa irakurtzean:% 2</translation>
</message>
@@ -3682,44 +3701,44 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>%1 fitxategia ezin da deskargatu zifratze informazioa falta delako.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Ezin da% 1 fitxategia deskargatu enkriptatze-informazioa falta delako.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Fitxategia aldatu egin da aurkitu zenetik</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Ezin da% 1 fitxategia deskargatu, fitxategi lokal baten izenarekin talka!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>%1 fitxategia ezin da deskargatu, fitxategi lokal baten izenarekin gatazka!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Deskargak disko lokaleko toki librea muga azpitik gutxituko luke</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>%1 baino toki libre gutxiago diskoan</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Fitxategia zerbitzaritik ezabatua izan da</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Fitxategia ezin izan da guztiz deskargatu.</translation>
</message>
@@ -3729,12 +3748,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Deskargatutako fitxategia hutsik dago zerbitzariak %1 izan beharko lituzkeela iragarri badu ere.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Deskargatutako fitxategia hutsik dago, baina zerbitzariak %1 izan beharko lukeela iragarri du.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 fitxategia ezin da gorde, fitxategi lokal baten izenarekin gatazka!</translation>
</message>
@@ -3744,18 +3763,18 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Errorea metadatuak datu-basean idaztean</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>% 1 fitxategiak zerbitzariak jakinarazitako aldaketa-ordu baliogabea du. Ez gorde.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Erorrea metadatuak eguneratzen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
@@ -4142,7 +4161,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Erantzun</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Baztertu</translation>
</message>
@@ -4189,32 +4208,43 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>ownCloud-en bidea:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikonoa</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>partekatu etiketa</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud-en bidea:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TestuEtiketa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Karpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 partekatzen</translation>
</message>
@@ -4224,17 +4254,17 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Fitxategia ezin da partekatu partekatze baimenik gabe partekatu delako.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Ezin da fitxategia partekatu, partekatzeko baimenik ez duelako.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Sartu pasahitza esteka partekatzeko:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Partekatzearen pasahitza beharrezkoa</translation>
</message>
@@ -4247,7 +4277,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Pasahitza:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Partekatu esteka</translation>
</message>
@@ -4257,7 +4287,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Oharra:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Oharra</translation>
</message>
@@ -4272,7 +4302,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Iraungitze-data:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Ezarri pasahitza</translation>
</message>
@@ -4282,7 +4312,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Iraungitzea:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Iraungitzen du</translation>
</message>
@@ -4377,27 +4407,27 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Ezabatu partekatze esteka</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Baieztatu partekatze estekaren ezabaketa</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ziur zaude &lt;i&gt;%1&lt;/i&gt;esteka publikoaren partekatzea ezabatu nahi duzula?&lt;/p&gt;&lt;p&gt;Oharra: Ekintza hau ezin da desegin.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Ezabatu</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Utzi</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Esteka publikoa</translation>
</message>
@@ -4405,7 +4435,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Partekatu erabiltzaile edo taldeekin ...</translation>
</message>
@@ -4415,7 +4445,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Bilatu globalki</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Esteka kopiatu</translation>
</message>
@@ -4425,22 +4455,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Ez dago emaitzarik &apos;%1&apos;(r)entzako</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Ez dago &quot;% 1&quot; (r)entzako emaitzarik</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Partekatzearen pasahitza beharrezkoa</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Idatzi pasahitza zure posta partekatzeko:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Zerbait partekatu dut zurekin</translation>
</message>
@@ -4448,7 +4478,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Erabiltzaile-izena</translation>
</message>
@@ -4458,62 +4488,62 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>editatu dezake</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Editatu dezake</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Oharra:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Pasahitza:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Iraungitzea:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Birparteka daiteke</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Oharra hartzailearentzat</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Ezarri iraungitze-data</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Ez partekatu</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Sortu dezake</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Aldatu dezake</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Ezabatu dezake</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Pasahitzarekin babestuta</translation>
</message>
@@ -4540,13 +4570,13 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Hautatu kokapen berria ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Zerbait partekatu dut zurekin</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Partekatze aukerak</translation>
</message>
@@ -4556,79 +4586,100 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Partekatu %1 bidez</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Jarduera</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopiatu esteka pribatua arbelera</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Bidali esteka pribatua postaz...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Fitxategi hau birpartekatzea ez da onartzen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Karpeta hau berriro partekatzea ez dago onartuta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopiatu esteka publikoa</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopiatu barne esteka</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Editatu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Ireki nabigatzailean</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Ebatzi gatazka ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Mugitu eta izena aldatu ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Mugitu, izena aldatu eta igo ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Ezabatu tokiko aldaketak</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Mugitu eta igo ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Ezabatu</translation>
</message>
@@ -5204,29 +5255,29 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Gehitu kontua</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Ireki elkarrizketa nagusia</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Gelditu sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Berrekin sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Ezarpenak</translation>
</message>
@@ -5236,22 +5287,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Laguntza</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Irten %1-(e)tik</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pausatu sinkronizazioa guztientzat</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Berrekin sinkronizazioa guztientzat</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5259,24 +5310,24 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Mahaigaineko %1 bezeroa&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;%1 bertsioa. Informazio gehiago eskuratzeko egin klik &lt;a href=&apos;%2&apos;&gt;hemen&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Fitxategi birtualen plugina erabiltzen:% 1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Argitalpen hau %1(e)k eman du&lt;/p&gt;</translation>
</message>
@@ -5284,22 +5335,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Ezin izan dira hornitzaileak atzitu.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Ezin izan dira bilaketa hornitzaileak lortu &apos;%1?-(r)entzat. Errorea: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>&apos;%2&apos; bilaketak huts egin du.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>&apos;%1&apos; bilaketak huts egin du. Errorea: %2</translation>
</message>
@@ -5307,7 +5358,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Saiatu dena berriro kargatzen</translation>
</message>
@@ -5340,22 +5391,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Baieztatu kontua kentzea</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Ziur zaude &lt;i&gt;%1&lt;/i&gt; kontura konexioa kendu nahi duzula?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Oharra:&lt;/b&gt; Honek &lt;b&gt;ez&lt;/b&gt; du fitxategirik ezabatuko.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Kendu konexioa</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Utzi</translation>
</message>
@@ -6017,7 +6068,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Karpeta berria</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Markatu irakurri gisa</translation>
</message>
@@ -6126,7 +6177,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Datu-basera konektatzeak huts egin du</translation>
</message>
@@ -6147,7 +6198,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Bilatu fitxategiak, mezuak, gertaerak ...</translation>
</message>
@@ -6171,7 +6222,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Kargatu emaitza gehiago </translation>
</message>
@@ -6209,7 +6260,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Kontua ez dago konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Kontuaren ekintzak</translation>
</message>
@@ -6219,18 +6270,18 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Kendu kontua</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Ezarri egoera</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Amaitu saioa</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Hasi saioa</translation>
@@ -6244,52 +6295,52 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Lineako egoera</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Linean</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Kanpoan</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Ez molestatu</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Ikusezina</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Egoera mezua</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Zein da zure egoera?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Garbitu egoera mezua ondoren</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Garbitu egoera mezua ondoren</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Ezarri egoera-mezua</translation>
</message>
@@ -6375,12 +6426,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Deskargatu den fitxategia ez dator bat kontroleko baturarekin, berrekin egingo da. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Kontroleko baturaren goiburuak &quot;%1&quot; motako kontroleko batura ezezagun bat dauka</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Deskargatu den fitxategia ez dator bat kontroleko baturarekin, berrekin egingo da. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6388,98 +6439,93 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Mahaigaineko Nextclouden elkarrizketa-koadro nagusia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Uneko kontua</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Berrekin sinkronizazioa guztientzat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pausatu sinkronizazioa guztientzat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Ezarri erabiltzaile-egoera</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Gehitu kontua</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Gehitu kontu berri bat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Ezarpenak</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Irten</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Uneko erabiltzailearen avatarra</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Erabiltzailea linean dago</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Erabiltzailea &apos;ez molestatu&apos; egoeran dago</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Kontu txandakatze eta ezarpenen menua</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Ireki uneko kontuaren karpeta lokala</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Ireki Nextcloud Talk nabigatzailean</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Aplikazio gehiago</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Aplikazioen menua</translation>
@@ -6500,7 +6546,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Ireki partekatzeko elkarrizketa-koadroa</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Aplikazio gehiago</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Ireki %1 arakatzailean</translation>
</message>
@@ -6511,7 +6562,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Erakutsi ekintza gehiago</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Bateratutako bilaketaren emaitzen zerrenda</translation>
</message>
@@ -6521,7 +6572,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Partekatu %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Fitxategiaren jarduera</translation>
</message>
@@ -6547,7 +6598,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; Git berrikuspenetik eraikia %3, %4 Qt %5 erabiliz, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 6dda31bc9..9c4d4c85c 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>قطع شده</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>متصل</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>سرویس خارج از دسترس</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>حالت تعمیر</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>خطای شبکه</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>خطای پیکربندی</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>درخواست مجوزها</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>وضعیت حساب ناشناخته</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>خطای دسترسی به پرونده پیکربندی</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1935,12 +1952,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>اضافه کردن اتصال همگام سازی پوشه</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>افزودن اتصال همگام سازی</translation>
</message>
@@ -1958,7 +1975,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>مسیر را به پوشه محلی وارد کنید.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>پوشه ی اصلی را انتخاب کنید</translation>
</message>
@@ -1966,7 +1983,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>ایجاد پوشه از راه دور</translation>
</message>
@@ -1976,47 +1993,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>نام پوشه جدید را برای ایجاد شدن در زیر &apos;1%&apos; وارد نمایید:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>پوشه با موفقیت ایجاد شده است %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>تأیید اعتبار دسترسی به 1% شکست خورد</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>شکست در ساخت پوشه در 1%. لطفا به صورت دستی بررسی کنید.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>شکست در فهرست کردن یک پوشه. خطا: 1%</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>این را برای همگام سازی کل حساب انتخاب کنید</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>این پوشه همگام‌سازی شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>شما از قبل &lt;i&gt;1%&lt;/i&gt; را همگام سازی کرده اید، که یک پوشه والد از &lt;i&gt;2%&lt;/i&gt; است.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2024,24 +2041,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2062,27 +2079,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>E-Tag از سرور دریافت نشده است، لطفا پروکسی/دروازه را بررسی نمایید</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>ما برای بازخوانی E-Tag متفاوتی دریافت کردیم. بار بعدی دوباره امتحان کنید.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>سرور محدوده محتوای اشتباهی برگرداند.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
@@ -2131,83 +2148,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>به روز رسانی ها</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>راه اندازی مجدد و به روز رسانی</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>پیشرفته</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>درخواست تایید قبل از همگام سازی پوشه های بزرگتر</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>درخواست تایید قبل از همگام سازی مخازن خارجی</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>نمایش گزارشگر برخورد</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>ویرایش پرونده های رد شده</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>نمایش اعلانات سرور نیازمند تائید می باشد</translation>
</message>
@@ -2217,49 +2236,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2611,7 +2630,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>خطا</translation>
</message>
@@ -2621,7 +2640,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;پرونده &apos;1%&apos; &lt;br/&gt; را نمی توان برای نوشتن باز کرد. &lt;br/&gt;&lt;br/&gt;خروجی log &lt;b&gt;نمی تواند&lt;/b&gt; ذخیره شود!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3502,12 +3521,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3522,22 +3541,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3547,47 +3566,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3597,7 +3616,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3638,44 +3657,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>پرونده از زمان کشف تغییر کرده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>پرونده 1% بخاطر یک پرونده محلی به نام برخورد دانلود نمی شود!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>دانلود فضای دیسک محلی آزاد تحت محدودیت را کاهش می دهد</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>فضای خالی دیسک کمتر از %1 است</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>فایل از روی سرور حذف شد</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>فایل به طور کامل قابل دانلود نیست.</translation>
</message>
@@ -3685,12 +3704,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>پرونده 1% بخاطر یک پرونده محلی به نام برخورد ذخیره نمی شود!</translation>
</message>
@@ -3700,18 +3719,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>خطا در نوشتن متادیتا در پایگاه داده</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4098,7 +4117,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>پنهان کن</translation>
</message>
@@ -4145,32 +4164,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>مسیر ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>آیکون</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>اشتراک‌گذاری برچسب</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>برچسب متنی</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>پوشه: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 اشتراک‌گذاری</translation>
</message>
@@ -4180,17 +4210,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4203,7 +4233,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>کلمه عبور</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4213,7 +4243,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4228,7 +4258,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>تاریخ انقضا</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>تعیین رمزعبور</translation>
</message>
@@ -4238,7 +4268,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4333,27 +4363,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>پیوند اشتراک را حذف کنید</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>حذف اشتراک گذاری لینک را تایید کنید</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;آیا شما واقعا می خواهید اشتراک لینک عمومی را حذف کنید&lt;i&gt;1%&lt;/i&gt;؟&lt;/p&gt;&lt;p&gt; توجه: این عمل نمی تواند انجام نشود.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>حذف</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>لغو</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>پیوند عمومی</translation>
</message>
@@ -4361,7 +4391,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4371,7 +4401,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>کپی کردن آدرس لینک</translation>
</message>
@@ -4381,22 +4411,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>هیچ نتیجه ای برای &apos;1%&apos; وجود ندارد</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>من چیزی را با شما به اشتراک گذاشتم</translation>
</message>
@@ -4404,7 +4434,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4414,62 +4444,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>می توان ویرایش کرد</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>امکان اشتراک گذاری وجود دارد</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>امکان ایجاد وجود دارد</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>امکان تغییر وجود دارد</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>امکان حذف وجود دار</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4496,13 +4526,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>من چیزی را با شما به اشتراک گذاشتم</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4512,79 +4542,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>لینک خصوصی را در کلیپ بورد کپی کنید</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>بازکردن در مرورگر</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>حذف</translation>
</message>
@@ -5159,29 +5210,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>افزودن حساب کاربری</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>تنظیمات</translation>
</message>
@@ -5191,22 +5242,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5214,24 +5265,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5239,22 +5290,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5262,7 +5313,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5295,22 +5346,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5972,7 +6023,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6081,7 +6132,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6102,7 +6153,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6126,7 +6177,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6164,7 +6215,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>اقدامات حساب</translation>
</message>
@@ -6174,18 +6225,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>خروج</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>ورود</translation>
@@ -6199,52 +6250,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6330,12 +6381,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6343,98 +6394,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>حساب جاری</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>افزودن حساب کاربری</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>تنظیمات</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>خروج</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>متصل</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>قطع شده</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>برنامه های بیشتر</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6455,7 +6501,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>برنامه های بیشتر</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>1% را در مرورگر باز کنید</translation>
</message>
@@ -6466,7 +6517,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6476,7 +6527,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6502,7 +6553,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index f3e60ab62..40af7e0ed 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Avaa %1 paikallisesti</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Hylkää</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Avaa jakoikkuna</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Päästä päähän-salauksen avain</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Kryptografisen identiteettisi suojaamiseksi salaamme sen 12-sanaisella avainkoodilla. Kirjaa se ylös ja pidä turvassa. Avainkoodia tarvitaan muiden laitteiden (kuten puhelimen tai kannettavan tietokoneen) yhdistämiseksi tiliisi.</translation>
</message>
@@ -733,47 +751,47 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Kirjauduttu ulos</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Yhteys katkaistu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Yhdistetty</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Palvelu ei ole käytettävissä</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Huoltotila</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Verkkovirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Asetusvirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Kysytään tilitietoja</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Tuntematon tilin tila</translation>
</message>
@@ -781,17 +799,17 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Lisää tapahtumia löydät Tapahtumat-sovelluksesta.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Symbolisia linkkejä ja tiedostoja, jotka ovat ohitettavien tiedostojen listalla, ei synkronoida.</translation>
</message>
@@ -852,42 +870,42 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Jatkaminen tarkoittaa &lt;b&gt;näiden asetusten poistamista &lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Jatkaminen tarkoittaa &lt;b&gt;näiden asetusten ohittamista &lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Jotkin asetetukset on asetettu uudemmalla sovelluksen versiolla ja käyttävät ominaisuuksia, jotka eivät ole saatavilla tässä versiossa.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Nykyiset asetukset on varmuuskopioituna kohteeseen %2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Lopeta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Jatka</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Asetustiedostoa ei voitu käyttää</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Lopeta %1</translation>
</message>
@@ -929,7 +947,6 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1202,8 +1219,8 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Palvelinvirhe: PROPFIND-vastaus ei ole XML-formaatissa!</translation>
</message>
@@ -1938,12 +1955,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Lisää kansion synkronointiyhteys</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Lisää synkronointiyhteys</translation>
</message>
@@ -1961,7 +1978,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Anna paikallisen kansion polku</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Valitse lähdekansio</translation>
</message>
@@ -1969,7 +1986,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Luo etäkansio</translation>
</message>
@@ -1979,47 +1996,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Syötä uuden kansion nimi alle &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Kansion listaaminen epäonnistui. Virhe: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Valitse tämä synkronoidaksesi koko tilin</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Tätä kansiota synkronoidaan jo.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Synkronoit jo kansiota &lt;i&gt;%1&lt;/i&gt;, ja se on kansion &lt;i&gt;%2&lt;/i&gt; yläkansio.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2027,24 +2044,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(kokeellinen)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2065,27 +2082,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -2134,83 +2151,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Päivitykset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Tarkista päivitykset &amp;automaattisesti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanava</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>vakaa</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Käynnistä uudelleen &amp;&amp; päivitä</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Tarkista päivitykset nyt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Lisäasetukset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Kysy vahvistus ennen kuin synkronoidaan kansiot suurempia kuin</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>Mt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Kysy vahvistus ennen kuin erilliset tallennustilat synkronoidaan</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>N&amp;äytä kaatumisraportoija</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Muokkaa &amp;ohitettavia tiedostoja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Koosta vianetsintätiedot...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Palvelinilmoitukset jotka vaativat huomiota.</translation>
</message>
@@ -2220,49 +2239,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Vaihdetaanko päivityskanavaa?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Vaihda päivityskanava</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Koosta vianetsintätiedot</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip-arkistot</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Vianetsintätiedot koostettu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Vianetsintätietodot koostettu kohteeseen %1</translation>
</message>
@@ -2618,7 +2637,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
@@ -2628,7 +2647,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Tiedostoa &apos;%1&apos;&lt;br/&gt;ei voida avata kirjoittamista varten.&lt;br/&gt;&lt;br/&gt;Lokitulostusta&lt;b&gt;ei&lt;/b&gt;pystytä tallentamaan!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3510,12 +3529,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>koko</translation>
</message>
@@ -3530,22 +3549,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>tiedoston id</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3555,47 +3574,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Virhe tietokantaa luettaessa</translation>
</message>
@@ -3605,7 +3624,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3646,44 +3665,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Levyllä on vapaata tilaa vähemmän kuin %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Tiedosto poistettiin palvelimelta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Tiedostoa ei voitu ladata täysin.</translation>
</message>
@@ -3693,12 +3712,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3708,18 +3727,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Virhe päivittäessä metatietoja: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on tällä hetkellä käytössä</translation>
</message>
@@ -4106,7 +4125,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Hylkää</translation>
</message>
@@ -4153,32 +4172,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud-polku:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Kuvake</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud-polku:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TekstiLeima</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Kansio: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 - Jakaminen</translation>
</message>
@@ -4188,17 +4218,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Salasana vaaditaan jaettavalle</translation>
</message>
@@ -4211,7 +4241,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Salasana:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Jaa linkki</translation>
</message>
@@ -4221,7 +4251,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4236,7 +4266,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Vanhenemispäivä:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Aseta salasana</translation>
</message>
@@ -4246,7 +4276,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Vanhenee:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Vanhenee</translation>
</message>
@@ -4341,27 +4371,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Poista jakolinkki</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Vahvista linkkijaon poistaminen</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Poista</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Julkinen linkki</translation>
</message>
@@ -4369,7 +4399,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Jaa käyttäjien tai ryhmien kanssa…</translation>
</message>
@@ -4379,7 +4409,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Hae globaalisti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopioi linkki</translation>
</message>
@@ -4389,22 +4419,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ei tuloksia haulla &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Ei tuloksia haulla &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Salasana vaaditaan jakoon</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Jaoin jotain kanssasi</translation>
</message>
@@ -4412,7 +4442,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Käyttäjätunnus</translation>
</message>
@@ -4422,62 +4452,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>voi muokata</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Voi muokata</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Salasana:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Vanhenee:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Voi uudelleenjakaa</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Aseta vanhenemispäivä</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Poista jako</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Voi luoda</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Voi muuttaa</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Voi poistaa</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Suojaa salasanalla</translation>
</message>
@@ -4504,13 +4534,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Valitse uusi sijainti…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Jaoin jotain kanssasi</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Jakamisen valinnat</translation>
</message>
@@ -4520,79 +4550,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Jaa käyttäen %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopioi yksityinen linkki leikepöydälle</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Lähetä yksityinen linkki sähköpostitse…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Tämän tiedoston uudelleenjakaminen ei ole sallittu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Tämän kansion uudelleenjakaminen ei ole sallittu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopioi julkinen linkki</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopioi sisäinen linkki</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Muokkaa</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Avaa selaimessa</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Selvitä virhetilanne …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Siirrä ja uudelleennimeä …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Siirrä, uudelleennimeä ja lataa …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Poista paikalliset muutokset</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Siirrä ja lataa …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Poista</translation>
</message>
@@ -5168,29 +5219,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Lisää tili</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Avaa pääikkuna</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Tauota synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Jatka synkronointia</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Asetukset</translation>
</message>
@@ -5200,22 +5251,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Lopeta %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5223,24 +5274,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1-työpöytäsovellus&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versio %1. Lisätietoja on saatavilla napsauttamalla &lt;a href=&apos;%2&apos;&gt;tästä&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5248,22 +5299,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5271,7 +5322,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Yritä uudelleen kaikkia lähetyksiä</translation>
</message>
@@ -5304,22 +5355,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Vahvista tilin poistaminen</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Poista yhteys</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
@@ -5981,7 +6032,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Uusi kansio</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6090,7 +6141,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Tietokantaan yhdistäminen epäonnistui.</translation>
</message>
@@ -6111,7 +6162,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Etsi tiedostoja, viestejä, tapahtumia…</translation>
</message>
@@ -6135,7 +6186,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Lataa lisää tuloksia</translation>
</message>
@@ -6173,7 +6224,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Tiliä ei yhdistetty</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Tilin toiminnot</translation>
</message>
@@ -6183,18 +6234,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Poista tili</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Aseta tilatieto</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Kirjaudu ulos</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Kirjaudu sisään</translation>
@@ -6208,52 +6259,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Poissa</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Älä häiritse</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Näkymätön</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Tilaviesti</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Mikä on tilatietosi?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Tyhjennä tilaviesti</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Aseta tilaviesti</translation>
</message>
@@ -6339,12 +6390,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ladattu tiedosto ei vastaa tarkistussummaa, jatketaan. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6352,98 +6403,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Nykyinen tili</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Jatka synkronointia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Tauota synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Aseta käyttäjän tila</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Lisää tili</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Lisää uusi tili</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Asetukset</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Poistu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Käyttäjän avatar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Nykyinen käyttäjän tila on Online</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Nykyinen käyttäjän tila on &apos;Älä häiritse&apos;</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Tilin valinta ja asetukset</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Avaa nykyisen tilin paikallinen kansio</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Yhdistetty</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Yhteys katkaistu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Avaa Nextcloud Talk selaimessa</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Lisää sovelluksia</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Sovellusvalikko</translation>
@@ -6464,7 +6510,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Avaa jakoikkuna</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Lisää sovelluksia</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
@@ -6475,7 +6526,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Näytä lisää toimintoja</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6485,7 +6536,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Jaa %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6511,7 +6562,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 4b267bc77..0e46226c7 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Ouvrir %1 localement</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>Dans %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Ouvrir la boîte de dialogue de partage</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Chiffrement de bout en bout mnémotechnique</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Pour protéger votre identité cryptographique, nous la chiffrons avec une mnémonique de 12 mots du dictionnaire. Veuillez les noter et les garder en sécurité. Ils seront nécessaires pour ajouter d’autres appareils à votre compte (comme votre téléphone portable ou votre ordinateur portable).</translation>
</message>
@@ -732,47 +750,47 @@ Vous prenez vos propres risques.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Connecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Service indisponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>mode maintenance</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Erreur réseau</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Erreur de configuration</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>informations d&apos;identification demandées</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Etat du compte inconnu</translation>
</message>
@@ -780,17 +798,17 @@ Vous prenez vos propres risques.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Pour plus d&apos;activités veuillez lancer l&apos;application Activité.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Les fichiers présents dans la liste d&apos;exclusion ainsi que les liens symboliques ne sont pas synchronisés.</translation>
</message>
@@ -851,42 +869,42 @@ Vous prenez vos propres risques.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Continuer va &lt;b&gt;supprimer ces paramètres&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Continuer va &lt;b&gt;ignorer ces paramètres&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Des paramètres ont été configurés dans des versions plus récentes que ce client et utilisent des fonctionnalités non disponibles dans la version actuelle. &lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; Le fichier de configuration actuel a été sauvegardé à &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Quitter</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continuer</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Erreur lors de l&apos;accès au fichier de configuration</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Une erreur s&apos;est produite lors de l&apos;accès au fichier de configuration situé dans %1. Assurez-vous que le fichier est accessible par votre utilisateur.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
@@ -928,7 +946,6 @@ Vous prenez vos propres risques.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Le fichier %1 présente une date de modification invalide. Envoi au serveur impossible.</translation>
</message>
@@ -1201,8 +1218,8 @@ Vous prenez vos propres risques.</translation>
<translation>Données manquantes dans la réponse à la découverte du fichier sur le serveur </translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Erreur du serveur : La réponse PROPFIND n&apos;est pas au format XML !</translation>
</message>
@@ -1959,12 +1976,12 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Ajouter une synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Ajouter la synchronisation</translation>
</message>
@@ -1982,7 +1999,7 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<translation>Entrez le chemin du dossier local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Sélectionnez le dossier source</translation>
</message>
@@ -1990,7 +2007,7 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Créer un dossier distant</translation>
</message>
@@ -2000,47 +2017,47 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<translation>Entrez le nom du nouveau dossier à créer dans &apos;%1&apos; :</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Entrez le nom du nouveau dossier à créer dans &quot;%1&quot; :</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Le dossier a été créé sur %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Erreur d&apos;authentification lors de l&apos;accès à %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Échec à la création du dossier sur %1. Veuillez vérifier manuellement.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Impossible de lister un dossier. Erreur : %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Sélectionnez ceci pour synchroniser l&apos;ensemble du compte</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Ce dossier est déjà en cours de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Vous synchronisez déjà &lt;i&gt;%1&lt;/i&gt; qui est un dossier parent de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Vous synchronisez déjà &lt;i&gt;%1&lt;/i&gt; qui est un sous-dossier de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2048,24 +2065,24 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Utiliser les fichiers virtuels au lieu de télécharger le contenu immédiatement %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation> (expérimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Vous ne pouvez pas définir la racine d&apos;une partition Windows pour votre dossier local. Veuillez choisir un (sous)dossier de la partition.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Les fichiers virtuels ne sont pas disponibles pour le dossier sélectionné</translation>
</message>
@@ -2086,27 +2103,27 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Nous avons reçu un téléchargement de Contenu-Longeur inattendu </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Le serveur a retourné une gamme de contenu erronée</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Délai d&apos;attente de connexion dépassé</translation>
</message>
@@ -2155,83 +2172,85 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Mises à jour</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Vérifier automatiquement la présence de nouvelles mises à jour</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>Canal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stable</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>bêta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>Redémarrer et Mettre à jour</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Vérifier la présence de mises à jour maintenant</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avancé</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Demander confirmation avant de synchroniser les dossiers de taille supérieure à </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>Mo</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Demander confirmation avant de synchroniser des stockages externes </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Afficher les dossiers synchronisés dans le panneau de navigation de l&apos;&amp;Explorateur de fichiers</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Affic&amp;her le rapport d&apos;incident</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Modifier les fichiers exclus</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Créer une archive de débogage…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Les notifications du serveur requérant votre attention.</translation>
</message>
@@ -2241,17 +2260,17 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Vous ne pouvez pas désactiver le démarrage automatique parce que le démarrage automatique à l&apos;échelle du système est activé.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Changer de canal de mise à jour ?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2260,32 +2279,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Notez que cela ne permet seulement de sélectionner où sont récupérées les mises à jour et qu&apos;il n&apos;y a pas de possibilité de rétrograder : Ainsi, le retour du canal &quot;bêta&quot; au canal &quot;stable&quot; ne peut généralement pas être fait immédiatement et implique d&apos;attendre une version stable plus récente que la version bêta actuellement installée.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Changer de canal de mise à jour</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Création de l&apos;archive de déboggage</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Archives Zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Archive de déboggage créée</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Archive de déboggage créée à %1</translation>
</message>
@@ -2646,7 +2665,7 @@ Les journaux seront écrits dans %1.</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
@@ -2656,7 +2675,7 @@ Les journaux seront écrits dans %1.</translation>
<translation>&lt;nobr&gt;Le fichier &apos;%1&apos;&lt;br/&gt;ne peut être ouvert en écriture.&lt;br/&gt;&lt;br/&gt;Le fichier de journalisation &lt;b&gt;ne peut pas&lt;/b&gt; être enregistré !&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Le fichier &quot;%1&quot;&lt;br/&gt;ne peut pas être ouvert en écriture.&lt;br/&gt;&lt;br/&gt;Le fichier journal &lt;b&gt;ne peut pas&lt;/b&gt; être sauvegardé !&lt;/nobr&gt;</translation>
</message>
@@ -3545,12 +3564,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Le nom du fichier est sur la liste noire du serveur.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Le fichier a une extension réservée pour les fichiers virtuels.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>taille</translation>
</message>
@@ -3565,22 +3584,22 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>le serveur a retourné &quot;no %1&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>permission</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>ID du fichier</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Le serveur n&apos;a signalé aucun %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Impossible de synchroniser à cause d&apos;une date de modification invalide</translation>
</message>
@@ -3590,47 +3609,47 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Conflit lors de l&apos;envoi de certains fichiers dans un dossier. Ceux conflictuels seront effacés!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Conflit lors de l&apos;envoi d&apos;un dossier. Il va être supprimé !</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Conflit lors de l&apos;envoi d&apos;un fichier. Il va être supprimé !</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Déplacé vers une cible invalide, restauration</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Erreur de lecture de la base de données</translation>
</message>
@@ -3640,7 +3659,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Le serveur a répondu avec une erreur au moment de lire le dossier &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Le serveur a répondu avec une erreur lors de la lecture du dossier &quot;%1&quot; : %2</translation>
</message>
@@ -3681,44 +3700,44 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Le fichier %1 ne peut pas être téléchargé car les informations de chiffrement sont manquantes.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Le fichier %1 ne peut pas être téléchargé car les informations de chiffrement sont manquantes.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Le fichier a changé depuis sa découverte</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Le fichier %1 ne peut pas être téléchargé en raison d&apos;un conflit sur le nom de fichier local !</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Le fichier %1 ne peut pas être téléchargé en raison d&apos;un conflit sur le nom de fichier local. </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Le téléchargement réduira l&apos;espace disque libre en dessous de la limite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Il y a moins de %1 d&apos;espace libre sur le disque</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Le fichier a été supprimé du serveur</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Le fichier n&apos;a pas pu être téléchargé intégralement.</translation>
</message>
@@ -3728,12 +3747,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Le fichier reçu est vide bien que le serveur indique que sa taille devrait être de %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Le fichier téléchargé est vide bien que le serveur indique que sa taille devrait être de %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Le fichier %1 n&apos;a pas pu être sauvegardé en raison d&apos;un conflit sur le nom du fichier local !</translation>
</message>
@@ -3743,18 +3762,18 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Le fichier %1 présente une date de modification invalide sur le serveur. Enregistrement impossible.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Erreur lors de la mise à jour des métadonnées : %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d&apos;utilisation</translation>
</message>
@@ -4141,7 +4160,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
@@ -4188,32 +4207,43 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Chemin ownCloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Icône</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>Partager le libellé</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Chemin Nextcloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Dossier: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Partage %1</translation>
</message>
@@ -4223,17 +4253,17 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Le fichier ne peut pas être partagé car il a été partagé sans permission de repartage.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Le fichier ne peut pas être partagé car il ne dispose pas des permissions de partage.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Veuillez saisir un mot de passe pour votre lien partagé :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Mot de passe requis</translation>
</message>
@@ -4246,7 +4276,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Mot de passe :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Partager le lien</translation>
</message>
@@ -4256,7 +4286,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Note :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Note</translation>
</message>
@@ -4271,7 +4301,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Date d&apos;expiration :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Définir le mot de passe</translation>
</message>
@@ -4281,7 +4311,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Expire le :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Expire</translation>
</message>
@@ -4376,28 +4406,28 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Supprimer le lien de partage</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmer la suppression du partage par lien</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Voulez-vous vraiment supprimer le partage par lien public&lt;i&gt;%1&lt;/i&gt;?
&lt;p&gt;Note: Cette action ne peut être annulée.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Anuler</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Lien public</translation>
</message>
@@ -4405,7 +4435,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Partager avec des utilisateurs ou des groupes ...</translation>
</message>
@@ -4415,7 +4445,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Rechercher partout</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copier le lien</translation>
</message>
@@ -4425,22 +4455,22 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Aucun résultat pour &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Aucun résultat pour &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Mot de passe obligatoire pour un partage</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Définissez un mot de passe pour le partage par e-mail :</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>J&apos;ai partagé quelque chose avec vous</translation>
</message>
@@ -4448,7 +4478,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
@@ -4458,62 +4488,62 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>peut modifier</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Peut modifier</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Note :</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Mot de passe :</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Expire le :</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Peut repartager</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Note au destinataire</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Définir une date d&apos;expiration</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Ne plus partager</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Peut créer</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Peut modifier</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Peut supprimer</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Protéger par mot de passe</translation>
</message>
@@ -4540,13 +4570,13 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Sélectionnez le nouvel emplacement ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>J&apos;ai partagé quelque chose avec vous</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Options de partage</translation>
</message>
@@ -4556,79 +4586,100 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Partager via %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copier le lien privé dans le presse-papier</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Envoyer le lien privé par courriel ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Repartager ce fichier est interdit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Repartager ce dossier est interdit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copier le lien public</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copier le lien interne</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Modifier</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Ouvrir dans le navigateur</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Résoudre le conflit ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Déplacer et renommer...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Déplacer, renommer et envoyer ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Supprimer les modifications locales</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Déplacer et envoyer ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
@@ -5204,29 +5255,29 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Ajouter un compte</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Ouvrir la fenêtre principale</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Suspendre la synchro</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Relancer la synchro</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
@@ -5236,22 +5287,22 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Aide</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Suspendre toutes les synchros</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Relancer toutes les synchros</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1 : %2</translation>
</message>
@@ -5259,24 +5310,24 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Client de bureau %1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Version %1. Pour plus d’informations, veuillez cliquer &lt;a href=&apos;%2&apos;&gt;ici&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Utilise l&apos;extension de fichiers virtuels : %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>Cette version est fournie par %1.</translation>
</message>
@@ -5284,22 +5335,22 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Échec de la récupération des fournisseurs.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Échec de la récupération des fournisseurs de recherche pour &apos;%1&apos;. Erreur : %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>La recherche de &apos;%2&apos; a échoué.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>La recherche de &apos;%1&apos; a échoué. Erreur: %2</translation>
</message>
@@ -5307,7 +5358,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Relancer tous les envois</translation>
</message>
@@ -5340,22 +5391,22 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Confirmer la suppression du compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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 la connexion au compte &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; cette opération &lt;b&gt;ne supprimera aucun de vos fichiers&lt;/b&gt; et ne supprimera pas non plus votre compte du serveur.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Supprimer la connexion</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -6017,7 +6068,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Nouveau dossier</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Marquer comme lu</translation>
</message>
@@ -6126,7 +6177,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Impossible de connecter la base de données.</translation>
</message>
@@ -6147,7 +6198,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Rechercher des fichiers, des messages, des événements …</translation>
</message>
@@ -6171,7 +6222,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Charger plus de résultats</translation>
</message>
@@ -6209,7 +6260,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Compte non connecté</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Actions du compte</translation>
</message>
@@ -6219,18 +6270,18 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Supprimer le compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Définir le statut</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Se connecter</translation>
@@ -6244,52 +6295,52 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Statut en ligne</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>En ligne</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Absent(e)</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Ne pas déranger</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Invisible</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Message de statut</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Quel est votre statut ?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Effacer le message de statut après</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Effacer le message de statut</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Définir le message de statut</translation>
</message>
@@ -6375,12 +6426,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Le fichier téléchargé ne correspond pas à la somme de contrôle, il va être téléchargé à nouveau. &apos;%1&apos; &lt;&gt; &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>L&apos;en-tête de somme de contrôle contenait un type de somme de contrôle inconnu &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Le fichier téléchargé ne correspond pas à la somme de contrôle, il sera repris. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6388,98 +6439,93 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Boîte de dialogue principale du bureau Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Compte actuel</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Relancer toutes les synchronisations</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Suspendre toutes les synchronisations</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Définir le statut de l&apos;utilisateur</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Ajouter un compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Ajouter un nouveau compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Quitter</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar de l&apos;utilisateur courant</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Le statut actuel de l&apos;utilisateur est en ligne</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Le statut actuel de l&apos;utilisateur est ne pas déranger</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Sélecteur de compte et menu des paramètres</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Ouvrir le dossier local de l&apos;utilisateur courant</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Connecté</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Ouvrez Nextcloud Talk dans le navigateur</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Plus d&apos;applications</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menu apps</translation>
@@ -6500,7 +6546,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Ouvrir la fenêtre de partage</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Plus d&apos;applications</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
@@ -6511,7 +6562,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Afficher plus d&apos;actions</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Liste de résultats de recherche unifiée</translation>
</message>
@@ -6521,7 +6572,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Partager %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Activité de fichier</translation>
</message>
@@ -6547,7 +6598,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Généré à partir de la révision Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; du %3, %4 en utilisant Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index d73fb451f..dd9b502ee 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemónico do cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Para protexer a súa identidade criptográfica, cifrámola cun mnemónico de 12 palabras do diccionario. Anóteas e manteñas en lugar seguro. Estas palabras serán necesarias para engadir outros dispositivos á súa cuenta (como un teléfono móvil ou un portátil). </translation>
</message>
@@ -734,47 +752,47 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servizo non dispoñíbel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo de mantemento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Produciuse un erro na rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Produciuse un erro de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando credenciais</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado da conta descoñecido</translation>
</message>
@@ -782,17 +800,17 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Para máis actividades, abra a aplicación Actividade.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Non se sincronizaran os ficheiros da lista de ignorados e as ligazóns simbólicas.</translation>
</message>
@@ -853,42 +871,42 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Continuar suporá &lt;b&gt;eliminar estes axustes&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Continuar suporá &lt;b&gt;ignorar estes axustes&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Algúns axustes foron configuradas nas versións máis recentes deste cliente e usan funcións que non están dispoñíbeis nesta versión. &lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; Fíxose unha copia de seguridade do ficheiro de configuración actual &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Produciuse un erro ao acceder ao ficheiro de configuración</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Produciuse un erro ao acceder ao ficheiro de configuración en %1. Asegúrese de que o ficheiro é accesíbel para o seu usuario.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
@@ -930,7 +948,6 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1203,8 +1220,8 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<translation>Á resposta de descubrimento de ficheiros do servidor fáltanlle datos. </translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Erro do servidor: a resposta PROPFIND non está formatada en XML.</translation>
</message>
@@ -1955,12 +1972,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Engadir a conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Engadir a conexión da sincronización</translation>
</message>
@@ -1978,7 +1995,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Introduza a ruta ao cartafol local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Escolla o cartafol de orixe</translation>
</message>
@@ -1986,7 +2003,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crear un cartafol remoto</translation>
</message>
@@ -1996,47 +2013,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Introduza o nome do novo cartafol que se creará a seguir «%1»:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Creouse correctamente o cartafol en %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Non foi posíbel facer a autenticación accedendo a %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Produciuse un fallo ao listar un cartafol. Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Escolla isto para sincronizar toda a conta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Este cartafol xa está sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Xa está a sincronizar &lt;i&gt;%1&lt;/i&gt;, é o cartafol pai de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Xa está a sincronizar &lt;i&gt;%1&lt;/i&gt;, é o subcartafol de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2044,24 +2061,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Use ficheiros virtuais no canto de descargar contido inmediatamente %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Os ficheiros virtuais non están dispoñíbeis para o cartafol seleccionado</translation>
</message>
@@ -2082,27 +2099,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Recibimos unha descarga inesperada de lonxitude do contido.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>O servidor devolveu un intervalo de contidos estragado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -2151,83 +2168,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizacións</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Comprobar automaticamente as &amp;actualizacións</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Canle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>estábel</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reiniciar e actualizar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Comprobar agora se hai actualizacións</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Preguntar se se queren sincronizar cartafoles de máis de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Preguntar se se queren sincronizar os cartafoles de almacenamento externo</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Amosar os cartafoles sincronizados no &amp;panel de navegación do navegador</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Amosar o informe de &amp;fallos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar ficheiros &amp;ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Crear o arquivo de depuración…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Notificacións do servidor que requiren atención.</translation>
</message>
@@ -2237,17 +2256,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Non pode desactivar o inicio automático porque o inicio automático de todo o sistema está activado.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Cambiar canle de actualización?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2256,32 +2275,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Teña en conta que isto só selecciona de que grupo se toman as actualizacións e que non hai reversións: polo tanto, volver da canle beta á canle estábel normalmente non se pode facer inmediatamente e significa agardar por unha versión estábel que sexa máis recente que a versión beta instalada actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Cambiar canle de actualización</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Crear arquivo de depuración</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Arquivos Zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Creose o arquivo de depuración</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>O arquivo de depuración creouse en %1</translation>
</message>
@@ -2642,7 +2661,7 @@ Os rexistros escribiranse en %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Produciuse un erro</translation>
</message>
@@ -2652,7 +2671,7 @@ Os rexistros escribiranse en %1</translation>
<translation>&lt;nobr&gt;O ficheiro «%1»&lt;br/&gt; non se pode abrir para escritura.&lt;br/&gt;&lt;br/&gt;A saída do rexistro &lt;b&gt;non&lt;/n&gt; se pode gardar!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3541,12 +3560,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>O nome do ficheiro está na lista de bloqueo no servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>O ficheiro ten a extensión reservada para ficheiros virtuais.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>tamaño</translation>
</message>
@@ -3561,22 +3580,22 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>o servidor non informou de %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>ID do ficheiro</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3586,47 +3605,47 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado por mor da lista de bloqueo de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Moveuse a un destino non válido, restaurándo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Produciuse un erro ao ler a base de datos</translation>
</message>
@@ -3636,7 +3655,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>O servidor respondeu cun erro ao ler o directorio «%1» : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3677,44 +3696,44 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Non é posíbel descargar o ficheiro %1 xa que falta información do cifrado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>O ficheiro cambiou após ser atopado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>A descarga reducirá o espazo libre local por baixo do límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>O espazo libre no disco é inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>O ficheiro vai ser eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Non foi posíbel descargar completamente o ficheiro.</translation>
</message>
@@ -3724,12 +3743,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>O ficheiro descargado está baleiro, aínda que o servidor dí que o seu tamaño debe ser de %1. </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
@@ -3739,18 +3758,18 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Produciuse un erro ao escribir os metadatos na base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4137,7 +4156,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Rexeitar</translation>
</message>
@@ -4184,32 +4203,43 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Ruta ao ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Icona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartir etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Ruta do Nexcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Etiqueta de texto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Cartafol: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Compartindo %1</translation>
</message>
@@ -4219,17 +4249,17 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Introduza un contrasinal para a súa ligazón de compartición:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>É necesario un contrasinal para compartir</translation>
</message>
@@ -4242,7 +4272,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Contrasinal:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Compartir a ligazón</translation>
</message>
@@ -4252,7 +4282,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Nota</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4267,7 +4297,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Data de caducidade:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Estabelecer o contrasinal</translation>
</message>
@@ -4277,7 +4307,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Caduca:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4372,27 +4402,27 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Eliminar a ligazón compartida</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar a eliminación da ligazón compartida</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Confirma que quere eliminar a ligazón pública compartida &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Nota: Esta acción non se pode desfacer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Ligazón pública</translation>
</message>
@@ -4400,7 +4430,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Compartir con usuarios ou grupos...</translation>
</message>
@@ -4410,7 +4440,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Busca global</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copiar a ligazón</translation>
</message>
@@ -4420,22 +4450,22 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Non hai resultados para «%1»</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Compartín algo con vostede</translation>
</message>
@@ -4443,7 +4473,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nome de usuario</translation>
</message>
@@ -4453,62 +4483,62 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>pode editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Pode volver compartir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Deixar de compartir </translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Pode crear</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Pode cambiar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Pode eliminar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4535,13 +4565,13 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Seleccionar a nova localización…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Compartín algo con vostede</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opcións da compartición</translation>
</message>
@@ -4551,79 +4581,100 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Compartido mediante %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar a ligazón privada no portapapeis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Enviar a ligazón privada por correo…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Non está permitido volver compartir este ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Non está permitido volver compartir este cartafol</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiar a ligazón pública</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copiar a ligazón interna</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Editar</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Resolver conflitos…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Mover e renomear…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Mover, renomear e enviar…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Eliminar os cambios locais</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Mover e enviar…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
@@ -5199,29 +5250,29 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Engadir unha conta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Abrir o diálogo principal</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Por en pausa a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Continuar coa sincronización</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Axustes</translation>
</message>
@@ -5231,22 +5282,22 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Por en pausa a sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Continuar coa sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5254,24 +5305,24 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Cliente de escritorio do %1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versión %1. Para obter máis información prema &lt;a href=&apos;%2&apos;&gt;aquí&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Esta versión foi fornecida por %1&lt;/p&gt;</translation>
</message>
@@ -5279,22 +5330,22 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5302,7 +5353,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Tentar de novo todos os envíos</translation>
</message>
@@ -5335,22 +5386,22 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Confirme a retirada da conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Confirma que 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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Retirar conexión</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -6012,7 +6063,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Novo cartafol</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6121,7 +6172,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6142,7 +6193,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6166,7 +6217,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6204,7 +6255,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Conta sen conectar</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Accións da conta</translation>
</message>
@@ -6214,18 +6265,18 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Retirar a conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Acceder</translation>
@@ -6239,52 +6290,52 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6370,12 +6421,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>O ficheiro descargado non coincide coa suma de comprobación. Retomase. «%1&apos; != &apos;%2»</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6383,98 +6434,93 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Diálogo principal do escritorio Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Conta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Continuar coa sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Por en pausa a sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Engadir unha conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Engadir unha conta nova</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Axustes</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar do usuario actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Cambiador de contas e menú de configuración</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Abrir o cartafol local da conta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Abrir o Nextcloud Talk no navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Máis aplicacións</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menú de aplicacións</translation>
@@ -6495,7 +6541,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Abrir o diálogo de compartición</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Máis aplicacións</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
@@ -6506,7 +6557,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Amosar máis accións</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6516,7 +6567,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation>Compartir %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6542,7 +6593,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Construido dende la revisión Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; en %3, %4 usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_he.ts b/translations/client_he.ts
index 1a8dbe4df..64982b1c6 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>תיבת זיכרון להצפנה מקצה לקצה.</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>להגנה על מזהה ההצפנה שלך, אנו מצפינים באמצעות תיבת זיכרון של 12 מילים. מומלץ לרשום אותן בצד ולשמור עליהן באיזור מוגן. ע&quot;י המילים הללו נוכל להוסיף מכשירים נוספים לחשבונך (כגון טלפון חכם או מחשב נייד).</translation>
</message>
@@ -730,47 +748,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>לא מחובר לחשבון</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>מנותק </translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>מחובר</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>השירות אינו זמין</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>מצב תחזוקה</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>שגיאת רשת</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>שגיאת הגדרות</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>מבקש אישור</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>מצב חשבון לא ידוע</translation>
</message>
@@ -778,17 +796,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>לפעילויות נוספות נא לפתוח את יישומון הפעילויות.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -849,42 +867,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>יציאה</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>המשך</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>אירעה שגיאה בגישה לקובץ ההגדרות</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>איראה שגיאה בגישה לקובץ ההגדרות ב %1. אנא וודא כי הקובץ נגיש למשתמש שלך.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>צא מ %1</translation>
</message>
@@ -926,7 +944,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1199,8 +1216,8 @@ This action will abort any currently running synchronization.</source>
<translation>תגובת גילוי הקבצים של השרת לוקה בחסר.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1934,12 +1951,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>הוספת חיבור סנכרון תיקיות</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>הוספת חיבור סנכרון</translation>
</message>
@@ -1957,7 +1974,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>יש למלא את נתיב התיקייה המקומית.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>נא לבחור את תיקיית המקור</translation>
</message>
@@ -1965,7 +1982,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>יצירת תיקייה מרוחקת</translation>
</message>
@@ -1975,47 +1992,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>יש להקליד את שם התיקייה החדשה שתיווצר להלן: ‚%1’</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>התיקייה נוצרה בהצלחה במיקום %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>נכשל האימות בגישה אל %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>נכשלה יצירת התיקייה תחת %1. נא לבדוק ידנית.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>הצגת התיקייה נכשלה. שגיאה: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>יש לבחור בזה כדי לסנכרן את כל החשבון</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>תיקייה זו כבר מסתנכרנת.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>כבר מתקיימת הסתנכרנות של &lt;i&gt;%1&lt;/i&gt;, שהיא תיקיית ההורה של &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2023,24 +2040,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(ניסיוני)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2061,27 +2078,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>השרת החזיר content-range שגוי</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>תם זמן החיבור</translation>
</message>
@@ -2130,83 +2147,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>עדכונים</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>לחפש עדכונים &amp;אוטומטית</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;ערוץ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>ה&amp;פעלה מחדש ועדכון</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>ל&amp;חפש עדכונים כעת</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>מתקדם</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>לבקש אישור בטרם סנכרון תיקיות שגודלן מעבר ל־</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>מ״ב</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>לבקש אישור בטרם סנכרון לאמצעי אחסון חיצוניים</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>ה&amp;צגת מדווח קריסות</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>עריכת קבצים בהת&amp;עלמות</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>התראות שרת שדורשות תשומת לב.</translation>
</message>
@@ -2216,49 +2235,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>להחליף את ערוץ העדכונים?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>החלפת ערוץ העדכונים</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>ביטול</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>ארכיוני Zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2612,7 +2631,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
@@ -2622,7 +2641,7 @@ Logs will be written to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3505,12 +3524,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3525,22 +3544,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3550,47 +3569,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3600,7 +3619,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3641,44 +3660,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>לא ניתן להוריד את הקובץ %1 כיוון שפרטי ההצפנה חסרים.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>הקובץ השתנה מאז שהתגלה</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>לא ניתן להוריד את הקובץ %1 עקב סתירה עם שם קובץ מקומי!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>ההורדה תפחית את המקום הפנוי בכונן המקומי אל מתחת לסף</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>המקום הפנוי בכונן קטן מ־%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>הקובץ נמחק מהשרת</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>לא ניתן להוריד את הקובץ במלואו.</translation>
</message>
@@ -3688,12 +3707,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>הקובץ שהתקבל ריק למרות שהשרת הכריז שגודלו אמור להיות %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>לא ניתן לשמור את הקובץ %1 עקב סתירה עם שם קובץ מקומי!</translation>
</message>
@@ -3703,18 +3722,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>שגיאה בכתיבת נתוני העל למסד הנתונים</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4101,7 +4120,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>התעלמות</translation>
</message>
@@ -4148,32 +4167,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>נתיב ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>סמל</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>תווית שיתוף</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>נתיב Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>תיקייה: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>שיתוף %1</translation>
</message>
@@ -4183,17 +4213,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>נא למלא ססמה לקישור השיתוף:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>נדרשת ססמה לשיתוף</translation>
</message>
@@ -4206,7 +4236,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ססמה:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>קישור שיתוף</translation>
</message>
@@ -4216,7 +4246,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>הערה:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4231,7 +4261,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>מועד תפוגת תוקף:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4241,7 +4271,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>תפוגה:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4336,27 +4366,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>מחיקת קישור שיתוף</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>אישור מחיקת קישור לשיתוף</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>מחיקה</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>ביטול</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>קישור ציבורי</translation>
</message>
@@ -4364,7 +4394,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>לשתף עם משתמשים או קבוצות…</translation>
</message>
@@ -4374,7 +4404,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>העתקת קישור</translation>
</message>
@@ -4384,22 +4414,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>אין תוצאות לחיפוש אחר ‚%1’</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>שיתפת אתך משהו</translation>
</message>
@@ -4407,7 +4437,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>שם משתמש</translation>
</message>
@@ -4417,62 +4447,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>הרשאה לעריכה</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>הרשאה לשיתוף מחדש</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>ביטול שיתוף</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>הרשאה ליצירה</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>הרשאה לעריכה</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>הרשאה למחיקה</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4499,13 +4529,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>שיתפתי אתך משהו</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>אפשרויות שיתוף</translation>
</message>
@@ -4515,79 +4545,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>שיתוף דרך %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>העתקת שיעור פרטי ללוח הגזירים</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>שליחת קישור פרטי בדוא״ל…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>אסור לשתף קובץ זה מחדש</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>העתקת קישור ציבורי</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>העתקת קישור פנימי</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>עריכה</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>פתיחה בדפדפן</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>מחיקה</translation>
</message>
@@ -5163,29 +5214,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>הוספת חשבון</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>הגדרות</translation>
</message>
@@ -5195,22 +5246,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5218,24 +5269,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 לקוח לשולחן העבודה&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;גרסה %1. למידע נוסף נא ללחוץ &lt;a href=&apos;%2&apos;&gt;כאן&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;גרסה זו סופקה על ידי %1&lt;/p&gt;</translation>
</message>
@@ -5243,22 +5294,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5266,7 +5317,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>לנסות את כל ההורדות מחדש</translation>
</message>
@@ -5299,22 +5350,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>אישור הסרת חשבון</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>הסרת חיבור</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>ביטול</translation>
</message>
@@ -5976,7 +6027,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6085,7 +6136,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6106,7 +6157,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6130,7 +6181,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6168,7 +6219,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>פעולות חשבון</translation>
</message>
@@ -6178,18 +6229,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>יציאה</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>כניסה</translation>
@@ -6203,52 +6254,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6334,12 +6385,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6347,98 +6398,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>חשבון נוכחי</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>הוספת חשבון</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>הגדרות</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>יציאה</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>מחובר</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>מנותק</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>יישומים נוספים</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6459,7 +6505,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>יישומים נוספים</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>פתיחת %1 בדפדפן</translation>
</message>
@@ -6470,7 +6521,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6480,7 +6531,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6506,7 +6557,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;נבנה מהמהדורה &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; ב־Git ב־%3, %4 באמצעות Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_hr.ts b/translations/client_hr.ts
index af926733e..f01e32fa9 100644
--- a/translations/client_hr.ts
+++ b/translations/client_hr.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Otvori %1 lokalno</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemonika cjelovitog šifriranja</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Kako bismo zaštitili vaš kriptografski identitet, šifriramo ga s pomoću mnemonika od 12 riječi iz rječnika. Zapamtite ih i čuvajte na sigurnom. Bit će vam potrebni za dodavanje drugih uređaja na vaš račun (poput mobilnog telefona ili prijenosnog računala).</translation>
</message>
@@ -734,47 +752,47 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Odjavljen</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Odspojen</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Povezan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Usluga nedostupna</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Način održavanja</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Pogreška mreže</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Pogreška konfiguracije</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Traženje vjerodajnica</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Nepoznato stanje računa</translation>
</message>
@@ -782,17 +800,17 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Više aktivnosti možete pronaći u aplikaciji Activity.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Ne sinkroniziraju se datoteke s popisa za zanemarivanje kao ni simboličke poveznice.</translation>
</message>
@@ -853,42 +871,42 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Nastavak znači &lt;b&gt;brisanje ovih postavki&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Nastavak znači &lt;b&gt;zanemarivanje ovih postavki&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Neke su postavke konfigurirane u novijim inačicama ovog klijenta i upotrebljavaju značajke koje nisu raspoložive u ovoj inačici.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Sigurnosna kopija trenutačne konfiguracijske datoteke već je pohranjena na &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Izađi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Nastavi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Pogreška pri pristupanju konfiguracijskoj datoteci</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Došlo je do pogreške prilikom pristupanja konfiguracijskoj datoteci na %1. Provjerite može li korisnik pristupiti datoteci.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Zatvori %1</translation>
</message>
@@ -930,7 +948,6 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1203,8 +1220,8 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
<translation>Nedostaju podaci u odgovoru datoteke poslužitelja.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Pogreška poslužitelja: PROPFIND odgovor nije formatiran u XML-u!</translation>
</message>
@@ -1960,12 +1977,12 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Dodaj poveznicu za sinkronizaciju mape</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Dodaj poveznicu za sinkronizaciju</translation>
</message>
@@ -1983,7 +2000,7 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<translation>Unesite put do lokalne mape.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Odaberi izvornu mapu</translation>
</message>
@@ -1991,7 +2008,7 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Stvori udaljenu mapu</translation>
</message>
@@ -2001,47 +2018,47 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<translation>Unesite naziv nove mape koja će se stvoriti ispod &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Unesite naziv nove mape koja će se stvoriti ispod „%1”:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Mapa je uspješno stvorena na %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Neuspješna autentifikacija za pristup %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Neuspješno stvaranje mape na %1. Provjerite ručno.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Neuspješno popisivanje mape. Pogreška: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Odaberite ovu opciju za sinkronizaciju cijelog računa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Ova se mapa već sinkronizira.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Već sinkronizirate &lt;i&gt;%1&lt;/i&gt;, nadređenu mapu od &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Već sinkronizirate &lt;i&gt;%1&lt;/i&gt;, podmapu od &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2049,24 +2066,24 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Upotrijebi virtualne datoteke umjesto trenutnog preuzimanja sadržaja %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(eksperimentalan)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Virtualne datoteke nisu podržane za lokalne mape koje se upotrebljavaju kao korijenske mape particije sustava Windows. Odaberite važeću podmapu ispod slova diskovne particije.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtualne datoteke nisu raspoložive za odabranu mapu</translation>
</message>
@@ -2087,27 +2104,27 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nijedna E-oznaka nije primljena s poslužitelja, označite proxy/pristupno računalo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Primljena je drugačija E-oznaka za nastavak. Ponovni pokušaj sljedeći put.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Primili smo neočekivano preuzimanje Content-Length.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Poslužitelj je vratio pogrešan raspon sadržaja</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Istek veze</translation>
</message>
@@ -2156,83 +2173,85 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Ažuriranja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>i automatski provjeri za ažuriranja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Channel</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabilna</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>Ponovno pokreni i ažuriraj</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>i provjeri za ažuriranja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Napredno</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Zatraži potvrdu prije sinkronizacije mapa većih od</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Zatraži potvrdu prije sinkronizacije vanjskih prostora za pohranu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Prikaži mape za sinkronizaciju u navigacijskom oknu preglednika datoteka</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Prikaži alat za izvješćivanje o padu sustava</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Uredi zanemarene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Stvori arhivu otklanjanja pogrešaka…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Obavijesti poslužitelja koje zahtijevaju pažnju.</translation>
</message>
@@ -2242,17 +2261,17 @@ Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovn
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Ne možete onemogućiti automatsko pokretanje jer je omogućeno automatsko pokretanje na razini cijelog sustava.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Promijeniti kanal za ažuriranje?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Imajte na umu da se ovime odabire samo kategorija iz koje dolaze nadogradnje i da nema vraćanja na stare inačice: stoga se povratak s beta kanala na stabilni kanal obično ne može odmah izvršiti, već je potrebno pričekati stabilnu inačicu koja je novija od trenutačno instalirane beta inačice.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Promijeni kanal za ažuriranje</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Odustani</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Stvori arhivu otklanjanja pogrešaka</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip arhive</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Arhiva otklanjanja pogrešaka je stvorena</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Arhiva otklanjanja pogrešaka je stvorena na %1</translation>
</message>
@@ -2647,7 +2666,7 @@ Zapisi se zapisuju u %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Pogreška</translation>
</message>
@@ -2657,7 +2676,7 @@ Zapisi se zapisuju u %1</translation>
<translation>&lt;nobr&gt;Datoteka ‘%1’&lt;br/&gt;se ne može otvoriti radi zapisivanja.&lt;br/&gt;&lt;br/&gt;Izlaz zapisa &lt;b&gt;ne može&lt;/b&gt; se spremiti!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Datoteka „%1”&lt;br/&gt;ne može se otvoriti radi zapisivanja.&lt;br/&gt;&lt;br/&gt;Izlaz zapisa &lt;b&gt;ne može&lt;/b&gt; se spremiti!&lt;/nobr&gt;</translation>
</message>
@@ -3546,12 +3565,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Ovaj naziv datoteke je blokiran na poslužitelju.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Datoteka ima nastavak koji je rezerviran za virtualne datoteke.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>veličina</translation>
</message>
@@ -3566,22 +3585,22 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>poslužitelj javlja da nema %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>dopuštenje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>id datoteke</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Poslužitelj javlja da nema %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3591,47 +3610,47 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Došlo je do nepodudaranja pri otpremanju nekih datoteka u mapu. Nepodudarne datoteke će biti izbrisane!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Došlo je do nepodudaranja pri otpremanju mape. Nepodudarne mape će biti izbrisane!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Došlo je do nepodudaranja pri otpremanju datoteke. Nepodudarna datoteka će biti uklonjena!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Zanemareno zbog crne liste „odaberi što će se sinkronizirati”</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Nije dopušteno jer nemate dopuštenje za dodavanje podmapa u tu mapu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Nije dopušteno jer nemate dopuštenje za dodavanje datoteka u tu mapu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nije dopušteno otpremiti ovu datoteku jer je dostupna samo za čitanje na poslužitelju, vraćanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Premješteno na nevažeće odredište, vraćanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Nije dopušteno uklanjanje, vraćanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Pogreška pri čitanju baze podataka</translation>
</message>
@@ -3641,7 +3660,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Poslužitelj je javio pogrešku pri čitanju direktorija &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Poslužitelj je javio pogrešku pri čitanju direktorija „%1” : %2</translation>
</message>
@@ -3682,44 +3701,44 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Datoteka %1 ne može se preuzeti jer nedostaju informacije o šifriranju.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Datoteka %1 ne može se preuzeti jer nedostaju informacije o šifriranju.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Datoteka se promijenila od njenog otkrića</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Datoteka %1 ne može se preuzeti zbog nepodudaranja naziva lokalne datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Datoteka %1 ne može se preuzeti zbog nepodudaranja naziva lokalne datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Preuzimanje bi smanjilo slobodni prostor na lokalnom disku ispod granice</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Slobodan prostor na disku manji je od %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Datoteka je izbrisana s poslužitelja</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Datoteku nije moguće u potpunosti preuzeti.</translation>
</message>
@@ -3729,12 +3748,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Preuzeta datoteka je prazna, unatoč tome što je poslužitelj javio da treba iznositi %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Preuzeta datoteka je prazna, ali poslužitelj je javio da treba biti %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Datoteka %1 ne može se spremiti zbog nepodudaranja naziva lokalne datoteke!</translation>
</message>
@@ -3744,18 +3763,18 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Pogreška pri pisanju metapodataka u bazu podataka</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Pogreška pri ažuriranju metapodataka: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
@@ -4142,7 +4161,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Zanemari</translation>
</message>
@@ -4189,32 +4208,43 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Put ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>oznaka za dijeljenje</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloudov put:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Mapa: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Dijeljenje</translation>
</message>
@@ -4224,17 +4254,17 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Datoteku nije moguće dijeliti jer je dijeljena bez dopuštenja.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Datoteku nije moguće dijeliti jer nema dopuštenje za dijeljenje.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Unesite zaporku svoje poveznice dijeljenja:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Potrebna je zaporka za dijeljenje</translation>
</message>
@@ -4247,7 +4277,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Zaporka:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Dijeli poveznicu</translation>
</message>
@@ -4257,7 +4287,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Bilješka:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Bilješka</translation>
</message>
@@ -4272,7 +4302,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Datum isteka:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Postavi zaporku</translation>
</message>
@@ -4282,7 +4312,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Istječe:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Istječe</translation>
</message>
@@ -4377,27 +4407,27 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Izbriši poveznicu dijeljenja</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Potvrdi brisanje dijeljenja poveznicom</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Želite li zaista izbrisati dijeljenje javnom poveznicom &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Napomena: ovu radnju ne možete poništiti.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Izbriši</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Odustani</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Javna poveznica</translation>
</message>
@@ -4405,7 +4435,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Dijelite s korisnicima ili grupama...</translation>
</message>
@@ -4415,7 +4445,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Pretraži globalno</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopiraj poveznicu</translation>
</message>
@@ -4425,22 +4455,22 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Nema rezultata za ‘%1’</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Nema rezultata za „%1”</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Potrebna je zaporka za dijeljenje</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Unesite zaporku svoje e-pošte dijeljenja:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Dijelim nešto s vama</translation>
</message>
@@ -4448,7 +4478,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Korisničko ime</translation>
</message>
@@ -4458,62 +4488,62 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>uređivanje moguće</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Uređivanje moguće</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Bilješka:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Zaporka:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Istječe:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Ponovno dijeljenje moguće</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Obavijest primatelju</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Postavi datum isteka</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Prestani dijeliti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Stvaranje moguće</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Mijenjanje moguće</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Brisanje moguće</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Zaštita zaporkom</translation>
</message>
@@ -4540,13 +4570,13 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Odaberi novu lokaciju…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Dijelim nešto s vama</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Mogućnosti dijeljenja</translation>
</message>
@@ -4556,79 +4586,100 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Dijeli putem %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Aktivnost</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopiraj privatnu poveznicu u međuspremnik</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Pošalji privatnu poveznicu e-poštom…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Dijeljenje ove datoteke nije dopušteno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Ponovno dijeljenje ove mape nije dopušteno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopiraj javnu poveznicu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopiraj internu poveznicu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Uredi</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Otvori u pregledniku</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Riješi nepodudaranje…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Premjesti i preimenuj…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Premjesti, preimenuj i otpremi…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Izbriši lokalne promjene</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Premjesti i otpremi…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Izbriši</translation>
</message>
@@ -5204,29 +5255,29 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Otvori glavni dijaloški okvir</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pauziraj sinkronizaciju</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Nastavi sinkronizaciju</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Postavke</translation>
</message>
@@ -5236,22 +5287,22 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Izlaz %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pauziraj sinkronizaciju za sve</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Nastavi sinkronizaciju za sve</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5259,24 +5310,24 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Klijent za osobna računala&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Inačica %1. Za više informacija kliknite &lt;a href=’%2’&gt;ovdje&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Upotreba dodatka za virtualne datoteke: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Ovo izdanje isporučuje %1&lt;/p&gt;</translation>
</message>
@@ -5284,22 +5335,22 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Dohvaćanje davatelja nije uspjelo.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Nije uspjelo dohvaćanje davatelja usluga pretraživanja za &apos;%1&apos;. Pogreška: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Pretraživanje za „%2“ nije uspjelo.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Pretraživanje za „%1” nije uspjelo. Pogreška: %2</translation>
</message>
@@ -5307,7 +5358,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Ponovno pokreni sve otpreme</translation>
</message>
@@ -5340,22 +5391,22 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Potvrdi brisanje računa</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Želite li zaista ukloniti vezu s računom &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Napomena:&lt;/b&gt; time &lt;b&gt;nećete&lt;/b&gt; izbrisati datoteke.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Ukloni vezu</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Odustani</translation>
</message>
@@ -6017,7 +6068,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Nova mapa</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6126,7 +6177,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Povezivanje baze podataka nije uspjelo.</translation>
</message>
@@ -6147,7 +6198,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Traži datoteke, poruke, događaje…</translation>
</message>
@@ -6171,7 +6222,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Učitaj više rezultata</translation>
</message>
@@ -6209,7 +6260,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Račun nije povezan</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Radnje računa</translation>
</message>
@@ -6219,18 +6270,18 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Izbriši račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Postavi status</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Prijava</translation>
@@ -6244,52 +6295,52 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Status na mreži</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Na mreži</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Odsutan</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Ne ometaj</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Nevidljiv</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Poruka statusa</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Koji je vaš status?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Izbriši poruku statusa nakon</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Izbriši poruku statusa</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Postavi poruku statusa</translation>
</message>
@@ -6375,12 +6426,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Preuzeta se datoteka ne podudara s kontrolnim zbrojem, nastavit će se. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Zaglavlje kontrolnog zbroja sadrži nepoznatu vrstu kontrolnog zbroja „%1”</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Preuzeta se datoteka ne podudara s kontrolnim zbrojem, nastavit će se. „%1” != „%2”</translation>
</message>
@@ -6388,98 +6439,93 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Glavni dijaloški okvir Nextclouda</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Trenutni račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Nastavi sinkronizaciju za sve</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pauziraj sinkronizaciju za sve</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Postavi status korisnika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Dodaj novi račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Postavke</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Izlaz</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar trenutnog korisnika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Trenutni status korisnika je „na mreži“</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Trenutni status korisnika je „ne ometaj“</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Izmjenjivač računa i izbornik postavki</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Otvori lokalnu mapu trenutnog računa</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Povezan</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Odspojen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Otvori Nextcloud Talk u pregledniku</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Više aplikacija</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Izbornik aplikacija</translation>
@@ -6500,7 +6546,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Otvori dijaloški okvir za dijeljenje</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Više aplikacija</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Otvori %1 u pregledniku</translation>
</message>
@@ -6511,7 +6562,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Prikaži dodatne radnje</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Objedinjen popis rezultata pretraživanja</translation>
</message>
@@ -6521,7 +6572,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation>Dijeli %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 – aktivnost datoteke</translation>
</message>
@@ -6547,7 +6598,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Izrađeno iz revizije Gita &lt;a href=&quot;%1“&gt;%2&lt;/a&gt;na %3, %4 s pomoću Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index 8cbb9413b..58c6c14a1 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>%1 megnyitása helyben</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>Itt: %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Mellőzés</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Megosztási párbeszédpanel megnyitása</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Végpontok közötti titkosítás mnemonikus kódja</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>A kriptográfiai személyazonossága megvédéséhez, egy 12 szótári szóból álló mnemonikus kóddal titkosítjuk. Jegyezze meg ezeket, és tartsa azokat biztonságban. Szüksége lesz rájuk, ha egy új eszközt akar hozzáadni a fiókjához (például a mobiltelefonját vagy a laptopját).</translation>
</message>
@@ -734,47 +752,47 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Kijelentkezve</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Kapcsolat bontva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Kapcsolódva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>A szolgáltatás nem érhető el</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Karbantartási üzemmód</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Hálózati hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Beállítási hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Hitelesítési adatok kérése</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Ismeretlen fiókállapot</translation>
</message>
@@ -782,17 +800,17 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>További tevékenységekhez nyissa meg a Tevékenységek alkalmazást.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>A mellőzési listából származó fájlok, valamint a szimbolikus linkek nincsenek szinkronizálva.</translation>
</message>
@@ -853,42 +871,42 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>A folytatás azt jelenti, hogy &lt;b&gt;törli ezeket a beállításokat&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>A folytatás azt jelenti, hogy &lt;b&gt;figyelmen kívül hagyja ezeket a beállításokat&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Néhány beállítást a kliens újabb verzióiban konfiguráltak, és olyan funkciókat használnak, amelyek ebben a verzióban nem érhetők el. &lt;br&gt; &lt;br&gt;%1&lt;br&gt;&lt;br&gt;Az aktuális konfigurációs fájlról már készült biztonsági másolat: &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Folytatás</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Hiba a konfigurációs fájl elérésekor</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Hiba történt a következő konfigurációs fájl elérésekor: %1. Győződjön meg róla, hogy a fájlt eléri a felhasználója.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>%1 kilépés</translation>
</message>
@@ -930,7 +948,6 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>A(z) %1 fájl módosítási ideje érvénytelen. Ne töltse fel a kiszolgálóra.</translation>
</message>
@@ -1203,8 +1220,8 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
<translation>A kiszolgáló fájlkutatási válaszából adatok hiányoznak.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Kiszolgálóhiba: A PROPFIND válasz nem XML formátumú!</translation>
</message>
@@ -1960,12 +1977,12 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Mappa szinkronizálási kapcsolat hozzáadása</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Szinkronizálási kapcsolat hozzáadása</translation>
</message>
@@ -1983,7 +2000,7 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<translation>Adja meg egy helyi mappa elérési útját.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Forrásmappa kiválasztása</translation>
</message>
@@ -1991,7 +2008,7 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Távoli mappa létrehozása</translation>
</message>
@@ -2001,47 +2018,47 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<translation>Adja meg a(z) „%1” alatt létrehozandó új mappa nevét:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Adja meg a(z) „%1” alatt létrehozandó új mappa nevét:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>A mappa sikeresen létrehozva itt: %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>A hitelesítés sikertelen a(z) %1 elérésekor</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>A mappa létrehozása sikertelen itt: 1. Ellenőrizze kézzel.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Egy mappa listázása meghiúsult. Hiba: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Válassza ezt a teljes fiókja szinkronizálásához</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Ez a mappa már szinkronizálva van.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Már szinkronizál a(z) &lt;i&gt;%1&lt;/i&gt; mappával, amely a(z) &lt;i&gt;%2&lt;/i&gt; szülőmappája.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Már szinkronizálja a(z) &lt;i&gt;%1&lt;/i&gt; mappát, amely a(z) &lt;i&gt;%2&lt;/i&gt; almappája.</translation>
</message>
@@ -2049,24 +2066,24 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Virtuális fájlok használata a tartalom azonnali letöltése helyett %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(kísérleti)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>A virtuális fájlok nem támogatottak a windowsos partíciók gyökerében helyi mappaként. Válasszon érvényes almappát a meghajtó betűjele alatt.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>A virtuális fájlok nem érhetők el a kiválasztott mappához</translation>
</message>
@@ -2087,27 +2104,27 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nem érkezett E-Tag a kiszolgálótól, ellenőrizze a proxyt/átjárót</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>A folytatáskor különböző E-Tag érkezett. Újrapróbálkozás legközelebb.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Váratlan letöltési „Content-Length” fejléc fogadva.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>A kiszolgáló hibás tartalomtartományt adott vissza</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Kapcsolati időtúllépés</translation>
</message>
@@ -2156,83 +2173,85 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Frissítések</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Frissítések &amp;automatikus keresése</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Csatorna</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabil</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>béta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>Új&amp;raindítás és frissítés</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>Frissítés &amp;ellenőrzése most</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Speciális</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Megerősítés kérése az ennél nagyobb mappák szinkronizálása előtt:</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Megerősítés kérése a külső tárolók szinkronizálása előtt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Szinkronizálási mappák megjelenítése az &amp;Intéző navigációs ablaktábláján</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>&amp;Hibabejelentő megjelenítése</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>&amp;Kihagyott fájlok szerkesztése</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Hibakeresési archívum létrehozása…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Kiszolgálóértesítések, melyek a figyelmét kérik.</translation>
</message>
@@ -2242,17 +2261,17 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Az automatikus indítást nem tilthatja le, mert az egész rendszerre kiterjedő automatikus indítás engedélyezett.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Módosítja a frissítési csatornát?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Ne feledje, hogy ez csak azt választja ki, hogy a frissítések milyen készletből származnak, és hogy régebbi verzióra nem lehet visszaállni: tehát a béta csatornáról a stabil csatornára való visszatérés általában nem azonnali, vagyis várni kell egy stabil verzióra, amely újabb, mint a jelenleg telepített béta változat.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Frissítési csatorna módosítása</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Mégse</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Hibakeresési archívum létrehozása</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip archívumok</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Hibakeresési archívum létrehozva</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>A hibakeresési archívum itt lett létrehozva: %1</translation>
</message>
@@ -2648,7 +2667,7 @@ A naplók ide lesznek írva: %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
@@ -2658,7 +2677,7 @@ A naplók ide lesznek írva: %1</translation>
<translation>&lt;nobr&gt;A(z) „%1” fájlt&lt;br/&gt;nem lehet írásra megnyitni.&lt;br/&gt;&lt;br/&gt;A naplózás kimenete &lt;b&gt;nem&lt;/b&gt; menthető!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;A(z) „%1” fájlt&lt;br/&gt;nem lehet írásra megnyitni.&lt;br/&gt;&lt;br/&gt;A naplózás kimenete &lt;b&gt;nem&lt;/b&gt; menthető!&lt;/nobr&gt;</translation>
</message>
@@ -3546,12 +3565,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>A fájlnév feketelistára került a kiszolgálón.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>A fájlnak virtuális fájlok számára fenntartott kiterjesztése van.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>méret</translation>
</message>
@@ -3566,22 +3585,22 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>kiszolgáló jelentése: hiányzó %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>jogosultság</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>fájlazonosító</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Kiszolgáló jelentése: hiányzó %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Az érvénytelen módosítási idő miatt nem lehet szinkronizálni</translation>
</message>
@@ -3591,47 +3610,47 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Ütközés a fájlok mappába feltöltésekor. Az ütköző fájlok törölve lesznek!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Ütközés a mappa feltöltésekor. Törölve lesz!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Ütközés a fájl feltöltésekor. Törölve lesz!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>A „válassza ki a szinkronizálni kívánt elemeket” feketelista miatt figyelmen kívül hagyva</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Nem engedélyezett, mert nincs engedélye almappák hozzáadásához az adott a mappához</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Nem engedélyezett, mert nincs engedélye fájlok hozzáadására az adott mappában</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ezt a fájlt nem lehet feltölteni, mert csak olvasható a kiszolgálón, helyreállítás</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Érvénytelen célba mozgatás, helyreállítás</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Az eltávolítás nem engedélyezett, helyreállítás</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Hiba történt az adatbázis olvasása során</translation>
</message>
@@ -3641,7 +3660,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>A kiszolgáló a következő hibával válaszolt a(z) „%1” könyvtár olvasása során: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>A kiszolgáló a következő hibával válaszolt a(z) „%1” könyvtár olvasása során: %2</translation>
</message>
@@ -3682,44 +3701,44 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>A(z) %1 fájl nem tölthető le, mert hiányoznak a titkosítási információk.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>A(z) %1 fájl nem tölthető le, mert hiányoznak a titkosítási információk.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>A fájl változott a felfedezése óta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>A(z) %1 fájl nem tölthető le, mert ütközik egy helyi fájl nevével.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>A(z) %1 fájl nem tölthető le, mert ütközik egy helyi fájl nevével.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>A letöltés a korlát alá csökkentené a szabad helyi tárterületet</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>A lemezen lévő szabad hely kevesebb mint %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>A fájl törlésre került a kiszolgálóról</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>A fájl nem tölthető le teljesen.</translation>
</message>
@@ -3729,12 +3748,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>A letöltött fájl üres, annak ellenére, hogy a kiszolgáló szerint %1 méretű kellene legyen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>A letöltött fájl üres, de a kiszolgáló szerint %1 méretűnek kellene lennie.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>A(z) %1 fájl nem menthető, mert ütközik egy helyi fájl nevével.</translation>
</message>
@@ -3744,18 +3763,18 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Hiba a metaadatok adatbázisba írásakor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>A(z) %1 fájl módosítási ideje a kiszolgáló szerint érvénytelen. Ne mentse el.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Hiba a metaadatok frissítésekor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>A(z) %1 fájl épp használatban van</translation>
</message>
@@ -4142,7 +4161,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Válasz</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Elutasítás</translation>
</message>
@@ -4189,32 +4208,43 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>ownCloud útvonal:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikon</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>megosztási címke</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud útvonal:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Mappa: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 megosztás</translation>
</message>
@@ -4224,17 +4254,17 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>A fájlt nem lehetett megosztani, mert megosztási jogosultság nélkül lett megosztva.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>A fájl nem osztható meg, mert nincs megosztási engedélye.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Adjon meg egy jelszót a megosztási hivatkozásához:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>A megosztáshoz jelszó szükséges</translation>
</message>
@@ -4247,7 +4277,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Jelszó:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Megosztási hivatkozás</translation>
</message>
@@ -4257,7 +4287,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Megjegyzés:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Jegyzet</translation>
</message>
@@ -4272,7 +4302,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Lejárati idő:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Jelszó beállítása</translation>
</message>
@@ -4282,7 +4312,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Lejárat:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Lejárat</translation>
</message>
@@ -4377,27 +4407,27 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Megosztási hivatkozás törlése</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Megosztási hivatkozás törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Tényleg törölni szeretné a(z) &lt;i&gt;%1&lt;/i&gt; nyilvános megosztási hivatkozást?&lt;/p&gt;&lt;p&gt;Megjegyzés: Ez nem vonható vissza.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Törlés</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Mégse</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Nyilvános hivatkozás</translation>
</message>
@@ -4405,7 +4435,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Megosztás felhasználókkal vagy csoportokkal …</translation>
</message>
@@ -4415,7 +4445,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Keresés globálisan</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Hivatkozás másolása</translation>
</message>
@@ -4425,22 +4455,22 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Nincs találat erre: „%1”</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Nincs találat erre: „%1”</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>A megosztáshoz jelszó szükséges</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Adjon meg egy jelszót a levélmegosztáshoz:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Megosztottam Önnel valamit</translation>
</message>
@@ -4448,7 +4478,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Felhasználónév</translation>
</message>
@@ -4458,62 +4488,62 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>szerkesztheti</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Szerkesztheti</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Megjegyzés:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Jelszó:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Lejárat:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Újra megosztható</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Jegyzet a címzettnek</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Lejárati idő beállítása</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Megosztás visszavonása</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Létrehozható</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Módosítható</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Törölhető</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Jelszavas védelem</translation>
</message>
@@ -4540,13 +4570,13 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Új hely kiválasztása…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Megosztottam Önnel valamit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Megosztási beállítások</translation>
</message>
@@ -4556,79 +4586,100 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Megosztás ezzel: %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Tevékenység</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Személyes hivatkozás másolása a vágólapra</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Személyes hivatkozás küldése e-mailben…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Ezt a fájlt nem lehet újra megosztani</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>A mappa továbbosztása nem megengedett</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Nyilvános hivatkozás másolása</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Belső hivatkozás másolása</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Szerkesztés</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Megnyitás böngészőben</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Konfliktus feloldása…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Áthelyezés és átnevezés…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Áthelyezés, átnevezés és feltöltés…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Helyi módosítások törlése</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Áthelyezés és feltöltés…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Törlés</translation>
</message>
@@ -5204,29 +5255,29 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Fiók hozzáadása</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Főablak megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Szinkronizálás felfüggesztése</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Szinkronizálás folytatása</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Beállítások</translation>
</message>
@@ -5236,22 +5287,22 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Súgó</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Kilépés a %1ból</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Szinkronizálás szüneteltetése mindenkinek</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Szinkronizálás folytatása mindenkinek</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5259,24 +5310,24 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 asztali kliens&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Verzió: %1. További információkért kattintson &lt;a href=&apos;%2&apos;&gt;ide&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Virtuális fájlok bővítmény használata: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Ezt a kiadást a %1 biztosította&lt;/p&gt;</translation>
</message>
@@ -5284,22 +5335,22 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>A szolgáltatók lekérése sikertelen</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>A(z) „%1” keresésszolgáltatóinak lekérése sikertelen. Hiba: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>A keresés a következőre sikertelen: „%2”.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>A keresés a következőre sikertelen: „%1”. Hiba: %2</translation>
</message>
@@ -5307,7 +5358,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Összes feltöltés újrapróbálása</translation>
</message>
@@ -5340,22 +5391,22 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Fiók törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Biztos, hogy eltávolítja a kapcsolatot a(z) &lt;i&gt;%1&lt;/i&gt; fiókkal?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés:&lt;/b&gt; Ez &lt;b&gt;nem&lt;/b&gt; töröl fájlokat.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Kapcsolat eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Mégse</translation>
</message>
@@ -6017,7 +6068,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Új mappa</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Megjelölés olvasottként</translation>
</message>
@@ -6126,7 +6177,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Az adatbázishoz való kapcsolódás sikertelen.</translation>
</message>
@@ -6147,7 +6198,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Fájlok, üzenetek, események keresése…</translation>
</message>
@@ -6171,7 +6222,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>További találatok betöltése</translation>
</message>
@@ -6209,7 +6260,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>A fiók nincs összekapcsolva</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Fiókműveletek</translation>
</message>
@@ -6219,18 +6270,18 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Fiók törlése</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Állapot beállítása</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Kijelentkezés</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Bejelentkezés</translation>
@@ -6244,52 +6295,52 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Online állapot</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Távol</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Ne zavarjanak</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Láthatatlan</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Állapotüzenet</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Mi az állapota?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Állapotüzenet törlése ennyi idő után:</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Állapotüzenet törlése</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Állapotüzenet beállítása</translation>
</message>
@@ -6375,12 +6426,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>A letöltött fájl ellenőrzőösszege nem egyezik, újra le lesz töltve. „%1” != „%2”</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Az ellenőrzőösszeg fejléc ismeretlen típusú értéket tartalmazott: „%1”</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>A letöltött fájl ellenőrzőösszege nem egyezik, újra le lesz töltve. „%1” != „%2”</translation>
</message>
@@ -6388,98 +6439,93 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>A Nextcloud asztali alkalmazás főablaka</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Jelenlegi fiók</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Szinkronizálás folytatása mindenkinek</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Szinkronizálás szüneteltetése mindenkinek</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Felhasználó állapotának beállítása</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Fiók hozzáadása</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Új fiók hozzáadása</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Beállítások</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Jelenlegi felhasználói profilkép</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Jelenlegi felhasználói állapot: online</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Jelenlegi felhasználói állapot: ne zavarjanak</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Fiókváltó és beállítások menü</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>A jelenlegi fiók helyi mappájának megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Kapcsolódva</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Kapcsolat bontva</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>A Nextcloud Beszélgetés alkalmazás megnyitása böngészőben</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>További alkalmazások</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Alkalmazások menü</translation>
@@ -6500,7 +6546,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Megosztási párbeszédpanel megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>További alkalmazások</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>A(z) %1 megnyitása böngészőben</translation>
</message>
@@ -6511,7 +6562,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>További műveletek megjelenítése</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Egyesített keresési találatlista</translation>
</message>
@@ -6521,7 +6572,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>%1 megosztása</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 – Fájl tevékenység</translation>
</message>
@@ -6547,7 +6598,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Összeállítva a(z) &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; Git verzióból, ekkor: %3, %4, Qt %5 (%6) használatával&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_id.ts b/translations/client_id.ts
index cd12d2861..c6635c7ee 100644
--- a/translations/client_id.ts
+++ b/translations/client_id.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Enkripsi mnemonic end to end</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Untuk melindungi Identitas Kriptografi Anda, kami mengenkripsinya dengan sebuah mnemonic dari 12 kamus kata. Mohon untuk dicatat dan amankan. Enkripsi ini akan dibutuhkan untuk menambah perangkat lainnya ke akun Anda (seperti ponsel Anda atau laptop).</translation>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Log keluar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Terputus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Tersambung</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Layanan tidak tersedia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Mode perbaikan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Kesalahan jaringan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Kesalahan konfigurasi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Menanyakan Kredensial</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Kondisi akun tidak diketahui</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Galat saat mengakses berkas konfigurasi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Terdapat kesalahan saat mengakses berkas konfigurasi pada %1. Mohon untuk memastikan berkas dapat diakses oleh pengguna Anda.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Keluar dari %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation>Ada data yang hilang di berkas server deteksi balasan.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1939,12 +1956,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Tambah Koneksi Sinkronisasi Folder</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Tambah Koneksi Sinkronisasi</translation>
</message>
@@ -1962,7 +1979,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Masukkan sebuah jalur ke folder lokal.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Pilih sumber folder</translation>
</message>
@@ -1970,7 +1987,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Buat Folder Remote</translation>
</message>
@@ -1980,47 +1997,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Masukkan nama untuk folder baru yang akan dibuat dibawah &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Folder telah sukses dibuat di %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autentikasi gagal saat mengakses %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Gagal untuk membuat folder baru di %1. Mohon cek secara manual.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Gagal untuk mengurutkan daftar folder. Galat: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Pilih ini untuk mensinkronisasi ke seluruh akun</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Folder ini telah disinkronisasi.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Anda sudah mensinkronisasi &lt;i&gt;%1&lt;/i&gt;, yang mana termasuk dalam folder &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2028,24 +2045,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2066,27 +2083,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Tidak ada E-Tag yang diterima dari server, cek Proksi/Gerbang</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Kami menerima sebuah E-Tag yang berbeda untuk dilanjutkan. Mencoba lain waktu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server kembali dengan jarak-konten yang salah</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Waktu Koneksi Habis</translation>
</message>
@@ -2135,83 +2152,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Pembaruan</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Hidupkan ulang &amp;&amp; Perbarui</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Tingkat Lanjut</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Meminta untuk konfirmasi sebelum sinkronisasi folder yang melebihi dari</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Meminta konfirmasi sebelum sinkronisasi penyimpanan eksternal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Tampilkan folder yang disinkronisasi di Panel Navigasi &amp;Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Sunting &amp;Abaikan Berkas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Notifikasi server yang memerlukan perhatian.</translation>
</message>
@@ -2221,49 +2240,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2618,7 +2637,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Galat</translation>
</message>
@@ -2628,7 +2647,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Berkas &apos;%1&apos;&lt;br/&gt;tidak dapat dibuka untuk ditulis.&lt;br/&gt;&lt;br/&gt;Keluaran log &lt;b&gt;tidak&lt;/b&gt;dapat disimpan!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3510,12 +3529,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3530,22 +3549,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3555,47 +3574,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3605,7 +3624,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3646,44 +3665,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
@@ -3693,12 +3712,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3708,18 +3727,18 @@ 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/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4106,7 +4125,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -4153,32 +4172,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
@@ -4188,17 +4218,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4211,7 +4241,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Bagi tautan</translation>
</message>
@@ -4221,7 +4251,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4236,7 +4266,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4246,7 +4276,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4341,27 +4371,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Hapus tautan berbagi</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation type="unfinished"/>
</message>
@@ -4369,7 +4399,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4379,7 +4409,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4389,22 +4419,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
@@ -4412,7 +4442,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4422,62 +4452,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>dapat edit</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Dapat membagikan</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4504,13 +4534,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4520,79 +4550,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Salin tautan publik</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Hapus</translation>
</message>
@@ -5166,29 +5217,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Tambah akun</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Setelan</translation>
</message>
@@ -5198,22 +5249,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
@@ -5221,24 +5272,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5246,22 +5297,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5269,7 +5320,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5302,22 +5353,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5979,7 +6030,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6088,7 +6139,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6109,7 +6160,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6133,7 +6184,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6171,7 +6222,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6181,18 +6232,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Tetapkan status</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Log keluar</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Log masuk</translation>
@@ -6206,52 +6257,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Tetapkan status pesan</translation>
</message>
@@ -6337,12 +6388,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6350,98 +6401,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Akun sekarang</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Tetapkan status pengguna</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Tambah akun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Setelan</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Tersambung</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Terputus</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Aplikasi lainnya</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6462,7 +6508,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Aplikasi lainnya</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
@@ -6473,7 +6524,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6483,7 +6534,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6509,7 +6560,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_is.ts b/translations/client_is.ts
index b7759afad..93a4003fa 100644
--- a/translations/client_is.ts
+++ b/translations/client_is.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -735,47 +753,47 @@ gagnageymslur: </translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Skráð/ur út</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Aftengt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Tengt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Þjónusta ekki tiltæk</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Viðhaldshamur</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Villa í netkerfi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Villa í stillingum</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Spyr um auðkenni</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Óþekkt staða notandaaðgangs</translation>
</message>
@@ -783,17 +801,17 @@ gagnageymslur: </translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -854,42 +872,42 @@ gagnageymslur: </translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Villa við að nálgast stillingaskrána</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Það kom upp villa við að nálgast stillingaskrána á %1. Gakktu úr skugga um að notandinn hafi heimild til að vinna með skrána.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Hætta í %1</translation>
</message>
@@ -931,7 +949,6 @@ gagnageymslur: </translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1202,8 +1219,8 @@ gagnageymslur: </translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1940,12 +1957,12 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Bæta við samstillingartengingu möppu</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Bæta við samstillingartengingu</translation>
</message>
@@ -1963,7 +1980,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<translation>Settu inn slóðina að staðværu möppunni.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Veldu upprunamöppu</translation>
</message>
@@ -1971,7 +1988,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Búa til fjartengda möppu</translation>
</message>
@@ -1981,47 +1998,47 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<translation>Settu inn nafn á nýju möppuna sem á að útbúa undir &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Það tókst að búa til staðværu möppuna á %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Auðkenning tókst ekki fyrir aðgang að %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Gat ekki búið til möppuna á %1. Athugaðu málið.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Gat ekki fengið skráalista úr möppu. Villa: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Veldu þetta til að samstilla allan aðganginn</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Þessa möppu er nú þegar verið að samstilla.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Þú ert nú þegar að samstilla &lt;i&gt;%1&lt;/i&gt;, sem er yfirmappa &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2029,24 +2046,24 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2067,27 +2084,27 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Tenging féll á tíma</translation>
</message>
@@ -2136,83 +2153,85 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Uppfærslur</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Leit&amp;a sjálfvirkt að uppfærslum</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>Endu&amp;rræsa &amp;&amp; uppfæra...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>At&amp;huga núna með uppfærslu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Ítarlegt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Biðja um staðfestingu áður en samstilltar eru möppur stærri en</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Biðja um staðfestingu áður en samstilltar eru ytri gagnageymslur</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Birta &amp;hrunskýrslugerðartól</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Bre&amp;yta hunsuðum skrám</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Tilkynningar frá þjóni sem krefjast athugunar.</translation>
</message>
@@ -2222,49 +2241,49 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2616,7 +2635,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Villa</translation>
</message>
@@ -2626,7 +2645,7 @@ Logs will be written to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3512,12 +3531,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3532,22 +3551,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3557,47 +3576,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3607,7 +3626,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3648,44 +3667,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ekki var hægt að sækja %1 skrána því dulritunarupplýsingar vantar.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Skráin hefur breyst síðan hún fannst</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Laust pláss á diski er minna en %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Skrá var eytt af þjóninum</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Ekki var hægt að sækja skrána að fullu.</translation>
</message>
@@ -3695,12 +3714,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3710,18 +3729,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Villa við ritun lýsigagna í gagnagrunninn</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4108,7 +4127,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Hafna</translation>
</message>
@@ -4155,32 +4174,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud slóð:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Táknmynd</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>merki á sameign</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud-slóð:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextaMerking</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Mappa: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 deilir</translation>
</message>
@@ -4190,17 +4220,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4213,7 +4243,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Lykilorð:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Deila tengli</translation>
</message>
@@ -4223,7 +4253,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Athugið:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4238,7 +4268,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Gildistími:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Skrá lykilorð</translation>
</message>
@@ -4248,7 +4278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Gildir til:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4343,28 +4373,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Eyða tengli á sameign</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Staðfestu eyðingu tengils á sameign</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ertu viss um að þú viljir eyða opinbera tenglinum á sameignina &lt;i&gt;%1&lt;/i&gt;?&lt;
/p&gt;&lt;p&gt;Athugaðu: Þessi aðgerð er óafturkræf.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Eyða</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Hætta við</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Opinber tengill</translation>
</message>
@@ -4372,7 +4402,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Deila með notendum eða hópum ...</translation>
</message>
@@ -4382,7 +4412,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Afrita tengil</translation>
</message>
@@ -4392,22 +4422,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Engar niðurstöður fyrir &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Ég deildi einhverju með þér</translation>
</message>
@@ -4415,7 +4445,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Notandanafn</translation>
</message>
@@ -4425,62 +4455,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>getur breytt</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Getur endurdeilt</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Hætta deilingu</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Getur búið til</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Getur breytt</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Getur eytt</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4507,13 +4537,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Ég deildi einhverju með þér</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Valkostir sameigna</translation>
</message>
@@ -4523,79 +4553,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Deila með %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Afrita einkatengil á klippispjald</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Senda einkatengil með tölvupósti …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Endurdeiling þessarar skráar er ekki leyfð</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Afrita opinberan tengil</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Afrita innri tengil</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Breyta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Opna í vafra</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Eyða</translation>
</message>
@@ -5171,29 +5222,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Bæta við notandaaðgangi</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Opna aðalglugga</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Stillingar</translation>
</message>
@@ -5203,22 +5254,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Loka %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5226,24 +5277,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 skjáborðsforrit&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Þessi útgáfa var gefin út af %1&lt;/p&gt;</translation>
</message>
@@ -5251,22 +5302,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5274,7 +5325,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Prófa aftur allar innsendingar</translation>
</message>
@@ -5307,23 +5358,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Staðfesta fjarlægingu aðgangs</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Viltu í alvörunni fjarlægja tenginguna við aðganginn
&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Athugið:&lt;/b&gt; Þetta mun &lt;b&gt;ekki&lt;/b&gt; eyða neinum skrám.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Fjarlægja tengingu</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Hætta við</translation>
</message>
@@ -5985,7 +6036,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6094,7 +6145,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6115,7 +6166,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6139,7 +6190,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6177,7 +6228,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Aðgerðir fyrir aðgang</translation>
</message>
@@ -6187,18 +6238,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Fjarlægja aðgang</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Skrá út</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Skrá inn</translation>
@@ -6212,52 +6263,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6343,12 +6394,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6356,98 +6407,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Núverandi notandaaðgangur</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Halda samstillingu áfram fyrir allt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Gera hlé á samstillingu fyrir allt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Bæta við notandaaðgangi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Stillingar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Fara út</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Tengt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Aftengt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Fleiri forrit</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6468,7 +6514,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Opna deilingarglugga</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Fleiri forrit</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Opna %1 í vafra</translation>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6489,7 +6540,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6518,7 +6569,7 @@ borð við &apos;trayer&apos; og reyna síðan aftur.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Byggt með Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; á %3, %4 með Qt %5,
%6&lt;/small&gt;&lt;/p&gt;</translation>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 10442ee63..1217fbed9 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Apri %1 localmente</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>In %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Apri finestra di condivisione</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Codice mnemonico per cifratura End to End</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Per proteggere la tua identità crittografica, la cifriamo con un codice mnemonico di 12 parole di dizionario. Annotale e tienile al sicuro. Saranno necessarie per aggiungere altri dispositivi al tuo account (come il tuo smartphone o il portatile).</translation>
</message>
@@ -734,47 +752,47 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Connesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servizio non disponibile</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modalità Manutenzione</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Errore di rete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Errore di configurazione</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Richiesta credenziali</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Stato dell&apos;account sconosciuto</translation>
</message>
@@ -782,17 +800,17 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Per altre attività, apri l&apos;applicazione Attività.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>I file dell&apos;elenco da ignorare e i collegamenti simbolici non sono sincronizzati.</translation>
</message>
@@ -853,42 +871,42 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Continuare significa &lt;b&gt;eliminare queste impostazioni&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Continuare significa &lt;b&gt;ignorare queste impostazioni&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Alcune impostazioni sono state configurate nelle versioni più recenti di questo client e utilizzano funzionalità che non sono disponibili in questa versione.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Il file di configurazione attuale è già stato sottoposto a backup su &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Errore accedendo al file di configurazione</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Si è verificato un errore durante l&apos;accesso al file di configurazione su %1. Assicurati che il file sia accessibile dal tuo utente.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
@@ -930,7 +948,6 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Il file %1 ha un orario di modifica non valido. Non inviarlo sul server.</translation>
</message>
@@ -1203,8 +1220,8 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<translation>La risposta del rilevamento file del server è dati mancanti.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Errore del server: la risposta PROPFIND non è in formato XML!</translation>
</message>
@@ -1961,12 +1978,12 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Aggiungi connessione di sincronizzazione</translation>
</message>
@@ -1984,7 +2001,7 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<translation>Digita il percorso della cartella locale.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Seleziona la cartella di origine</translation>
</message>
@@ -1992,7 +2009,7 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea cartella remota</translation>
</message>
@@ -2002,47 +2019,47 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<translation>Digita il nome della nuova cartella da creare sotto a &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Digita il nome della nuova cartella da creare sotto a &quot;%1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>La cartella è stata creata correttamente su %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autenticazione non riuscita durante l&apos;accesso a %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Non è stato possibile creare la cartella su %1. Controlla manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Impossibile elencare una cartella. Errore: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selezionala per sincronizzare l&apos;intero account</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Questa cartella è già sincronizzata.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Stai già sincronizzando &lt;i&gt;%1&lt;/i&gt;, che è la cartella superiore di &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Stai già sincronizzando &lt;i&gt;%1&lt;/i&gt;, che è una sottocartella di &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2050,24 +2067,24 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Usa file virtuali invece di scaricare immediatamente il contenuto %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(sperimentale)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>I file virtuali non sono supportati per le radici delle partizioni di Windows come cartelle locali. Scegli una sottocartella valida sotto la lettera del disco.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>I file virtuali non sono abilitati per la cartella selezionata</translation>
</message>
@@ -2088,27 +2105,27 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Abbiamo ricevuto un Content-Length inatteso dello scaricamento.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Il server ha restituito un content-range errato</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -2157,83 +2174,85 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Aggiornamenti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Verific&amp;a automaticamente la presenza di aggiornamenti.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Canale</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabile</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Riavvia e aggiorna</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>Vuoi &amp;controllare gli aggiornamenti ora?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avanzate</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Chiedi conferma prima di scaricare cartelle più grandi di</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Chiedi conferma prima di sincronizzare storage esterni</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Mostra le cartelle di sincronizzazione nel pannello di navigazione di &amp;Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Mostra il rapporto di c&amp;hiusura inattesa</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Mod&amp;ifica file ignorati</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Crea archivio di debug…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Notifiche del server che richiedono attenzione.</translation>
</message>
@@ -2243,49 +2262,49 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Non puoi disabilitare l&apos;avvio automatico poiché è abilitato l&apos;avvio automatico a livello di sistema.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Vuoi cambiare il canale di aggiornamento?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation>Il canale di aggiornamento determina quali aggiornamenti del client saranno offerti per l&apos;installazione. Il canale &quot;stabile&quot; contiene solo aggiornamenti considerati affidabili, mentre le versioni nel canale &quot;beta&quot; possono contenere nuove funzionalità e correzioni di bug, ma non sono state ancora provate a fondo. Nota che questo seleziona solo da quale pool vengono prelevati gli aggiornamenti e che non ci sono downgrade: per cui tornare dal canale beta al canale stabile di solito non può essere fatto immediatamente e significa aspettare una versione stabile che sia più recente della versione beta attualmente installata.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Cambia il canale di aggiornamento</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Crea archivio di debug</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Archivi zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Archivio di debug creato</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>L&apos;archivio di debug è stato creato in %1</translation>
</message>
@@ -2644,7 +2663,7 @@ I log saranno scritti in %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Errore</translation>
</message>
@@ -2654,7 +2673,7 @@ I log saranno scritti in %1</translation>
<translation>&lt;nobr&gt;Il file &apos;%1&apos;&lt;br/&gt;non può essere aperto in scrittura.&lt;br/&gt;&lt;br/&gt;Il risultato del log &lt;b&gt;non&lt;/b&gt; può essere salvato!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Il file &quot;%1&quot;&lt;br/&gt;non può essere aperto in scrittura.&lt;br/&gt;&lt;br/&gt;Il risultato del log &lt;b&gt;non&lt;/b&gt; può essere salvato!&lt;/nobr&gt;</translation>
</message>
@@ -3536,12 +3555,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Il nome del file è nella lista nera sul server.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Il file ha l&apos;estensione riservata ai file virtuali.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>dimensione</translation>
</message>
@@ -3556,22 +3575,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>il server non ha restituito alcun %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>permesso</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>ID del file</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Il server non ha restituito alcun %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Impossibile sincronizzare a causa di un orario di modifica non valido</translation>
</message>
@@ -3581,47 +3600,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Conflitto durante l&apos;invio di alcuni file in una cartella. I file in conflitto verranno eliminati!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Conflitto durante l&apos;invio di una cartella. Verrà svuotata!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Conflitto durante l&apos;invio di un file. Verrà rimosso!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Non consentito perché non sei autorizzato ad aggiungere sottocartelle a quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Non ti è consentito perché non hai i permessi per aggiungere file in quella cartella </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non ti è permesso caricare questo file perché hai l&apos;accesso in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Spostato su una destinazione non valida, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Errore durante la lettura del database</translation>
</message>
@@ -3631,7 +3650,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Il server ha risposto con un errore durante la lettura della cartella &apos;% 1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Il server ha risposto con un errore durante la lettura della cartella &quot;%1&quot; : %2</translation>
</message>
@@ -3672,44 +3691,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Il file %1 non può essere scaricato per la mancanza di informazioni di cifratura.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Il file %1 non può essere scaricato per la mancanza di informazioni di crittografia.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Il file è stato modificato dal suo rilevamento</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Il file %1 non può essere scaricato per un conflitto con il nome di un file locale!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Lo scaricamento ridurrà lo spazio disco libero locale sotto il limite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Lo spazio libero su disco è inferiore a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Il file è stato eliminato dal server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Il file non può essere scaricato completamente.</translation>
</message>
@@ -3719,12 +3738,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Il file scaricato è vuoto, ma il server ha indicato una dimensione di %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
</message>
@@ -3734,18 +3753,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Il file %1 ha un orario di modifica non valido segnalato dal server. Non salvarlo.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Errore di invio dei metadati: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Il file %1 è attualmente in uso</translation>
</message>
@@ -4132,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Rispondi</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Annulla</translation>
</message>
@@ -4179,32 +4198,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Percorso di ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Icona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>etichetta di condivisione</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Percorso Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>EtichettaTesto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Cartella: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Condivisione %1</translation>
</message>
@@ -4214,17 +4244,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Il file non può essere condiviso perché non ha permessi di condivisione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Digita una password per il tuo collegamento di condivisione:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Password per condivisione richiesta</translation>
</message>
@@ -4237,7 +4267,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Password:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Condividi collegamento</translation>
</message>
@@ -4247,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Nota</translation>
</message>
@@ -4262,7 +4292,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Data di scadenza:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Imposta password</translation>
</message>
@@ -4272,7 +4302,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Scade:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Scade</translation>
</message>
@@ -4367,27 +4397,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Elimina collegamento di condivisione</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Conferma eliminazione collegamento di condivisione</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero eliminare la condivisione del collegamento pubblico &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Nota: questa azione non può essere annullata.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Elimina</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Collegamento pubblico</translation>
</message>
@@ -4395,7 +4425,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Condividi con utenti o gruppi...</translation>
</message>
@@ -4405,7 +4435,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Cerca globalmente</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copia collegamento</translation>
</message>
@@ -4415,22 +4445,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nessun risultato per &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Nessun risultato per &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Richiesta password per condivisione</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Digita una password per la condivisione dell&apos;email:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Ho condiviso qualcosa con te</translation>
</message>
@@ -4438,7 +4468,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nome utente</translation>
</message>
@@ -4448,62 +4478,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>può modificare</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Può modificare</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Password:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Scade:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Può ri-condividere</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Nota al destinatario</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Imposta data di scadenza</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Rimuovi condivisione</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Può creare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Può cambiare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Può eliminare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Protezione con password</translation>
</message>
@@ -4530,13 +4560,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Seleziona nuova posizione…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Ho condiviso qualcosa con te</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opzioni di condivisione</translation>
</message>
@@ -4546,79 +4576,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Condividi tramite %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Attività</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copia link privato negli appunti</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Invia collegamento privato tramite email…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>La ri-condivisione di questo file non è consentita</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>La ri-condivisione di questa cartella non è consentita</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copia collegamento pubblico</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copia collegamento interno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Modifica</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Apri nel browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Risolvi conflitto…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Sposta e rinomina…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Sposta, rinomina e carica…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Elimina modifiche locali</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Sposta e carica…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Elimina</translation>
</message>
@@ -5194,29 +5245,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Aggiungi account</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Apri finestra principale</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Impostazioni</translation>
</message>
@@ -5226,22 +5277,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Assistenza</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Sospendi la sincronizzazione per tutto</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Riprendi la sincronizzazione per tutto</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5249,24 +5300,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Client desktop di %1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versione %1. Per ulteriori informazioni, fai clic &lt;a href=&apos;%2&apos;&gt;qui&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Usato il plugin dei file virtuali: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Questa versione è stata fornita da %1&lt;/p&gt;</translation>
</message>
@@ -5274,22 +5325,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Recupero dei fornitori non riuscito.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Recupero dei fornitori di ricerca per &apos;%1&apos;. Errore: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Ricerca di &apos;%2&apos; fallita.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Ricerca di &apos;%1&apos; fallita. Errore: %2</translation>
</message>
@@ -5297,7 +5348,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Riprova tutti i caricamenti</translation>
</message>
@@ -5330,22 +5381,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Conferma rimozione account</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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 rimuovere 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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Rimuovi connessione</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@@ -6007,7 +6058,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nuova cartella</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Marca come letto</translation>
</message>
@@ -6116,7 +6167,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Connessione al database non riuscita.</translation>
</message>
@@ -6137,7 +6188,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Cerca file, messaggi, eventi …</translation>
</message>
@@ -6161,7 +6212,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Carica più risultati</translation>
</message>
@@ -6199,7 +6250,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Account non connesso</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Azioni account</translation>
</message>
@@ -6209,18 +6260,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Rimuovi account</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Imposta stato</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Accedi</translation>
@@ -6234,52 +6285,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Stato in linea</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>In linea</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Assente</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Non disturbare</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Invisibile</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Messaggio di stato</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Qual è il tuo stato?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Cancella il messaggio di stato dopo</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Cancella il messaggio di stato</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Imposta il messaggio di stato</translation>
</message>
@@ -6365,12 +6416,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Il file scaricato non verifica il codice di controllo, sarà ripristinato. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>L&apos;intestazione di controllo conteneva un tipo di codice di controllo &quot;%1&quot; sconosciuto</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Il file scaricato non verifica il codice di controllo, sarà ripristinato. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6378,98 +6429,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Finestra principale di Nextcloud desktop</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Account attuale</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Riprendi la sincronizzazione per tutto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Sospendi la sincronizzazione per tutto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Imposta lo stato utente</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Aggiungi account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Aggiungi nuovo account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Impostazioni</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar dell&apos;utente attuale</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Lo stato attuale dell&apos;utente è in linea</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Lo stato attuale dell&apos;utente è non disturbare</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Selettore account e menu impostazioni</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Apri cartella locale dell&apos;account attuale</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Connesso</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Apri Nextcloud Talk nel browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Altre applicazioni</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menu Applicazioni</translation>
@@ -6490,7 +6536,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Apri finestra di condivisione</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Altre applicazioni</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser</translation>
</message>
@@ -6501,7 +6552,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Mostra altre azioni</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Lista unificata dei risultati di ricerca</translation>
</message>
@@ -6511,7 +6562,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Condividi %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Attività file</translation>
</message>
@@ -6537,7 +6588,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Compilato dalla revisione Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; il %3, %4 utilizzando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index fe091512a..fe12f48c2 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>ローカルで %1 を開く</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>%1 内</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>閉じる</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>共有ダイアログを開く</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>エンドツーエンド暗号化ニーモニック</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>あなたの暗号鍵の安全性を確保するために、12の単語からなるニーモニックであなたの暗号鍵を暗号化します。この12の単語は、あなたの別のデバイス(携帯端末やコンピュータなど)にこのアカウントを追加する際に必要になりますので、安全に保管してください。</translation>
</message>
@@ -734,47 +752,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>接続しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>サービスが利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>メンテナンスモード</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>ネットワークエラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>設定エラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>証明書を要求</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>不明なアカウント状態</translation>
</message>
@@ -782,17 +800,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>その他のアクティビティについては、アクティビティアプリを開いてください。</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>除外ファイルリスト内のファイルやシンボリックリンクは同期されません。</translation>
</message>
@@ -853,42 +871,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>続行すると、&lt;b&gt;これらの設定を削除&lt;/b&gt;するようになります。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>続行すると、&lt;b&gt;これらの設定を無視&lt;/b&gt;するようになります。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>一部の設定は、このクライアントのより新しいバージョンで構成されており、このバージョンでは使用できない機能を使用しています。&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;現在の構成ファイルは、&lt;i&gt;%2&lt;/i&gt; に既にバックアップされています。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>終了</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>続ける</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>設定ファイルのアクセスでエラーが発生しました</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>%1の設定ファイルのアクセス中にエラーが発生しました。 ユーザーがファイルにアクセスできることを確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
@@ -930,7 +948,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>ファイル %1 の更新日時が無効です。サーバにアップロードしないでください。</translation>
</message>
@@ -1203,8 +1220,8 @@ This action will abort any currently running synchronization.</source>
<translation>サーバーファイルの検出応答にデータがありません。</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>サーバーエラーが発生しました。PROPFIND応答がXML形式ではありません!</translation>
</message>
@@ -1959,12 +1976,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>同期フォルダーを追加</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>同期接続を追加</translation>
</message>
@@ -1982,7 +1999,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>ローカルフォルダーのパスを入力してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>ソースフォルダーを選択</translation>
</message>
@@ -1990,7 +2007,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>リモートフォルダーを追加</translation>
</message>
@@ -2000,47 +2017,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation> &apos;%1&apos;の下に新しいフォルダーの名前を入力:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation> &quot;%1&quot; 以下に新しいフォルダーの名前を入力:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>%1 にフォルダーが作成されました。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>%1 アクセス中に認証に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>フォルダーをリストアップできません。エラー: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>アカウント全体を同期する場合はこちらを選択</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>このフォルダーはすでに同期されています。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%1&lt;/i&gt;は、&lt;i&gt;%2&lt;/i&gt;の親フォルダーですでに同期しています。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%2 &lt;/i&gt;のサブフォルダーである&lt;i&gt;%1 &lt;/i&gt;を既に同期しています。</translation>
</message>
@@ -2048,24 +2065,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>すぐにファイルを同期してダウンロードする代わりに仮想ファイルを利用する %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(試験的)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>仮想ファイルは、ローカルフォルダーのWindowsルートパーティションではサポートされていません。ドライブレターの下の有効なサブフォルダを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>選択したフォルダーで仮想ファイルが使用できません</translation>
</message>
@@ -2086,27 +2103,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>ダウンロードのContent-Lengthが期待値と違います</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>サーバーが間違ったcontent-rangeを返しました</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -2155,83 +2172,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>アップデート</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>自動的にアップデートを確認(&amp;A)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>チャネル(&amp;C)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>安定板</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>ベータ版</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>再起動してアップデート(&amp;R)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>今すぐアップデートを確認(&amp;C)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>詳細設定</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>指定された容量以上のフォルダーは同期前に確認</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>外部ストレージと同期する前に確認</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>エクスプローラのナビゲーションペインに同期フォルダーを表示</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>クラッシュ報告を表示(&amp;H)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>除外ファイルリストを編集(&amp;I)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>デバッグアーカイブを作成...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>注意が必要なサーバー通知。</translation>
</message>
@@ -2241,17 +2260,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>システム全体の自動起動が有効になっているため、自動起動を無効にすることはできません。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>更新チャネルを変更しますか?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2260,32 +2279,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
これはアップデートをどちらのチャネルからダウンロードするのかを決めるだけで、パッケージをダウングレードすることはできないことに注意してください。その為、ベータ版から安定版へ変更しても、通常はすぐに古いパッケージに戻されるわけではありません。現在インストールされているベータ版よりも新しい安定版が出るまで待つ必要があります。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>更新チャネルを変更</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>デバッグアーカイブを作成</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zipアーカイブ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>デバッグアーカイブを作成しました</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>%1 にデバッグアーカイブを作成しました</translation>
</message>
@@ -2644,7 +2663,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>エラー</translation>
</message>
@@ -2654,7 +2673,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;ファイル &apos;%1&apos;&lt;br/&gt;を書き込み用で開けませんでした。&lt;br/&gt;&lt;br/&gt;ログ出力を&lt;b&gt;保存できません&lt;/b&gt;でした!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;ファイル &quot;%1&quot;&lt;br/&gt;を書き込み用で開けませんでした。&lt;br/&gt;&lt;br/&gt;ログ出力を&lt;b&gt;保存できません&lt;/b&gt;でした!&lt;/nobr&gt;</translation>
</message>
@@ -3542,12 +3561,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>このファイル名はサーバーにブロックされました。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>ファイルの拡張子は仮想ファイル用に予約されています。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>サイズ</translation>
</message>
@@ -3562,22 +3581,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>サーバーから no %1 と通知がありました</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>権限</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>ファイルID</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>修正日時が無効なため同期できません</translation>
</message>
@@ -3587,47 +3606,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>一部のファイルをフォルダにアップロードするときに競合が発生しました。これらの競合はクリアされます!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>フォルダをアップロードするときに競合したので、クリアされます!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>フォルダをアップロードするときに競合したので、削除されます!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>無効なターゲットに移動し、復元しました</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>削除、復元は許可されていません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>データベースを読み込み中にエラーが発生しました</translation>
</message>
@@ -3637,7 +3656,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>サーバーがディレクトリ &apos;%1&apos; の読み取り中にエラーで応答しました: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>サーバーでディレクトリ &quot;%1&quot; を読み取り中にエラーになりました: %2</translation>
</message>
@@ -3678,44 +3697,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>暗号化情報がないため、ファイル%1をダウンロードできません。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>暗号化情報がないため、ファイル%1をダウンロードできません。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>ファイルは発見以降に変更されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>ローカルファイル名が競合しているため、ファイル %1 をダウンロードできませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>ダウンロードすることによりローカルディスクの空き容量が制限を下回ります。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>ディスク空き容量が %1 よりも少なくなっています</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>ファイルはサーバーから削除されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>このファイルのダウンロードは完了しませんでした</translation>
</message>
@@ -3725,12 +3744,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>ダウンロードしたファイルは空ですが、サーバでは %1 であるはずです。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 はローカルファイル名が衝突しているため保存できません!</translation>
</message>
@@ -3740,18 +3759,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>ファイル %1 のサーバから報告された修正日時が無効です。保存しないでください。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>メタデータの更新中にエラーが発生しました:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>ファイル %1 は現在使用中です</translation>
</message>
@@ -4138,7 +4157,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>返信</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>閉じる</translation>
</message>
@@ -4185,32 +4204,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>OwnCloudのパス:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>アイコン</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>共有ラベル</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloudのパス:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>テキストラベル</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>フォルダー: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 を共有中</translation>
</message>
@@ -4220,17 +4250,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>共有権限がないため、ファイルを共有できません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>リンク共有のパスワードを入力してください。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>共有用のパスワードが必要です</translation>
</message>
@@ -4243,7 +4273,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>パスワード:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>リンクの共有</translation>
</message>
@@ -4253,7 +4283,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>注意:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>ノート</translation>
</message>
@@ -4268,7 +4298,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>有効期限:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>パスワードを設定</translation>
</message>
@@ -4278,7 +4308,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>有効期限:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>有効期限</translation>
</message>
@@ -4373,27 +4403,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>共有リンクを削除</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>リンク共有の削除を確認する</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;本当にこの公開リンク共有&lt;i&gt;%1&lt;/i&gt;を削除しますか?&lt;/p&gt;&lt;p&gt;注:この操作を元に戻すことはできません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>公開リンク</translation>
</message>
@@ -4401,7 +4431,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>ユーザーやグループとの共有 ...</translation>
</message>
@@ -4411,7 +4441,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>全体で検索</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>リンクをコピー</translation>
</message>
@@ -4421,22 +4451,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>&apos;%1&apos; は見つかりませんでした</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>&quot;%1&quot; は見つかりませんでした</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>共有用のパスワードが必要です</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>メール共有のパスワードを入力してください:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>私はあなたと何かを共有しました</translation>
</message>
@@ -4444,7 +4474,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>ユーザー名</translation>
</message>
@@ -4454,62 +4484,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>編集を許可</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>編集可能</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>メモ:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>パスワード:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>有効期限:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>再共有可能</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>受信者へのメモ</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>有効期限を設定</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>共有解除</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>作成可能</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>変更可能</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>削除可能</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>パスワード保護</translation>
</message>
@@ -4536,13 +4566,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>新しい場所の選択...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>私はあなたと何かを共有しました</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>共有オプション</translation>
</message>
@@ -4552,79 +4582,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 経由で共有</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>プライベートリンクをクリップボードにコピーする</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>メールでプライベートリンクを送信…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>このファイルの再共有は許可されていません</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>このフォルダーの再共有は許可されていません</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>公開リンクのコピー</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>内部リンクをコピー</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>編集</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>ブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>競合を解決する…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>移動して名前を変更…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>移動、名前の変更、アップロード…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>ローカルの変更を削除する</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>移動してアップロード…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>削除</translation>
</message>
@@ -5200,29 +5251,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>アカウントを追加</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>メインダイアログを開く</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>設定</translation>
</message>
@@ -5232,22 +5283,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/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>全ての同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>すべての同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5255,24 +5306,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 デスクトップクライアント&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;バージョン %1. 詳細な情報は&lt;a href=&apos;%2&apos;&gt;ここ&lt;/a&gt;をクリックしてください。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;仮想ファイルシステムプラグインを利用:%1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;このリリースは%1によって提供されました&lt;/p&gt;</translation>
</message>
@@ -5280,22 +5331,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>&apos;%2&apos; を検索できませんでした</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>&apos;%1&apos; を検索できませんでした。エラー: %2</translation>
</message>
@@ -5303,7 +5354,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>すべてのアップロードを再試行</translation>
</message>
@@ -5336,22 +5387,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>アカウント削除の確認</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>接続を外す</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -6013,7 +6064,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>新しいフォルダー</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>既読にする</translation>
</message>
@@ -6122,7 +6173,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>データベースに接続できません</translation>
</message>
@@ -6143,7 +6194,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>ファイルやメッセージ、イベントを検索</translation>
</message>
@@ -6167,7 +6218,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>結果をさらに読み込む</translation>
</message>
@@ -6205,7 +6256,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>アカウントは接続していません</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>アカウント操作</translation>
</message>
@@ -6215,18 +6266,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>アカウントを削除</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>ステータスを設定</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>ログアウト</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>ログイン</translation>
@@ -6240,52 +6291,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>オンラインステータス</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>オンライン</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>離席中</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>取り込み中</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>オフライン</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>ステータスメッセージ</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>現在のオンラインステータスは?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>メッセージ有効期限</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>ステータスメッセージを消去</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>ステータスメッセージを設定</translation>
</message>
@@ -6371,12 +6422,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ダウンロードしたファイルがチェックサムと一致しないため、再度ダウンロードされます。 &apos;%1&apos;!= &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>チェックサムヘッダーに不明なチェックサムタイプ &quot;%1&quot; が含まれていました</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>ダウンロードしたファイルがチェックサムと一致しないため、再度ダウンロードされます。 &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6384,98 +6435,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloudデスクトップのメインダイアログ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>現在のアカウント</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>全ての同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>全ての同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>ステータスを設定</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>アカウントを追加</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>新しいアカウントを追加</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>終了</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>現在のユーザーアバター</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>現在のユーザーステータスはオンラインです</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>現在のユーザーステータスは取り込み中です</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>アカウントスイッチャーと設定メニュー</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>現在のアカウントのローカルフォルダーを開く</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>接続しました</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Nextcloud Talk をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>その他のアプリ</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>アプリメニュー</translation>
@@ -6496,7 +6542,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>共有ダイアログを開く</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>その他のアプリ</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
@@ -6507,7 +6558,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>その他のアクションを表示</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>統合検索結果</translation>
</message>
@@ -6517,7 +6568,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>「%1」を共有</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - ファイルアクティビティ</translation>
</message>
@@ -6543,7 +6594,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; %3, %4 のGitリビジョンからのビルド Qt %5, %6 を利用&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_ko.ts b/translations/client_ko.ts
index 218efc58f..30a18e46f 100644
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>로컬에서 %1 열기</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>종단간 암호화 연상 기호</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>암호화 신원을 보호하기 위해 12개의 사전 단어를 사용하여 암호화합니다. 이 내용을 기록하고 안전하게 보관하십시오. 휴대 전화 나 노트북과 같은 다른 기기를 계정에 추가해야합니다.</translation>
</message>
@@ -734,47 +752,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>로그아웃</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>연결 해제됨</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>연결됨</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>서비스 사용할 수 없음</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>유지 보수 모드</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>네트워크 오류</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>설정 오류</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>자격 증명 요청</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>알 수 없는 사용자 상태</translation>
</message>
@@ -782,17 +800,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>무시 목록의 파일과 심볼릭 링크는 동기화되지 않습니다.</translation>
</message>
@@ -853,42 +871,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>계속 진행할 경우 &lt;b&gt;본 설정이 삭제됩니다&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>계속 진행할 경우 &lt;b&gt;본 설정이 무시됩니다&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>일부 항목은 더 높은 버전에서 설정되었으며 이 버전에서 사용 가능하지 않는 기능을 이용합니다. &lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; 현재 설정은 &lt;i&gt;%2&lt;/i&gt;에 백업되었습니다.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>끝내기</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>계속</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>설정 파일 액세스 오류</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>설정 파일%1을 액세스하는 중 오류가 발생했습니다. 사용자가 파일에 액세스 할 수 있는지 확인하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>%1 끝내기</translation>
</message>
@@ -930,7 +948,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>파일 %1의 &apos;수정 시간&apos;값이 올바르지 않습니다. 이 파일을 서버에 업로드하지 마십시오.</translation>
</message>
@@ -1203,8 +1220,8 @@ This action will abort any currently running synchronization.</source>
<translation>서버 파일 감지 응답에 데이터가 없습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1960,12 +1977,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>동기화 폴더 연결 추가</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>동기화 연결 추가</translation>
</message>
@@ -1983,7 +2000,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>로컬 폴더의 경로를 입력하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>원본 폴더 선택</translation>
</message>
@@ -1991,7 +2008,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>원격 폴더 생성</translation>
</message>
@@ -2001,47 +2018,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>&apos;%1&apos; 아래에 만들 새 폴더의 이름을 입력하십시오:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>&quot;%1&quot; 아래에 만들 새 폴더의 이름을 입력하십시오:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>%1에 폴더가 성공적으로 생성되었습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>%1에 액세스하는 인증이 실패했습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>%1에 폴더를 생성하지 못했습니다. 수동으로 확인하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>폴더를 나열하지 못했습니다. 오류: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>전체 계정을 동기화하려면 이 옵션을 선택하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>이 폴더는 이미 동기화 중입니다.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>이미 &lt;i&gt;%2&lt;/i&gt;의 상위 폴더 인 &lt;i&gt;%1&lt;/i&gt;을 동기화하고 있습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>이미 &lt;i&gt;%2&lt;/i&gt;의 하위 폴더인 &lt;i&gt;%1&lt;/i&gt;을 동기화하고 있습니다.</translation>
</message>
@@ -2049,25 +2066,25 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>내용을 즉시 다운로드 하는 대신 가상 파일을 사용 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(실험적)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>가상 파일은 윈도우 파티션 루트에 로컬 폴더로 지원되지 않습니다.
드라이브 문자가 지정된 유효한 하위 폴더를 선택하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>가상 파일을 선택한 폴더에서 사용 가능하지 않음</translation>
</message>
@@ -2088,27 +2105,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>서버에서 E-Tag를 받지 못했습니다. 프록시/게이트웨이를 확인하십시오.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>재개를 위해 다른 E-Tag를 받았습니다. 다음에 재시도하십시오.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>서버가 잘못된 내용 범위를 반환했습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>연결 시간 만료</translation>
</message>
@@ -2157,83 +2174,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>업데이트</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;자동으로 업데이트 확인</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;채널</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>안정판</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>베타</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>업데이트 재시작</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;지금 업데이트 확인</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>고급</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>다음 보다 큰 폴더를 동기화하기 전에 확인하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>외부 저장소를 동기화하기 전에 확인하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>탐색기의 탐색 창에 동기화 폴더 표시</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>충돌 알림 표시</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>무시된 파일 수정</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>디버그 아카이브 만들기 ...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>주의가 필요한 서버 알림</translation>
</message>
@@ -2243,17 +2262,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>시스템 단위 자동 시작이 활성화되어 있으므로 자동 시작을 비활성화할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>업데이트 채널을 바꾸시겠습니까?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2262,32 +2281,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
채널 선택은 무엇으로 업그레이드를 할 지 결정하며 다운그레이드는 없습니다. 따라서, 베타 체널에서 안정화 채널로 변경할 경우 대개 버전을 즉시 변경할 수 없으며 현재 설치된 베타 버전보다 더 최신인 안정화 버전이 출시될 때 까지 기다려야 합니다.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>업데이트 채널 변경</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>취소</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>디버그 아카이브 만들기</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>아카이브 압축</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>디버그 아카이브가 생성됨</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>디버그 아카이브가 %1에 생성됨</translation>
</message>
@@ -2648,7 +2667,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>오류</translation>
</message>
@@ -2658,7 +2677,7 @@ Logs will be written to %1</source>
<translation> 쓰기 위해 &lt;nobr&gt;파일 &apos;%1&apos;&lt;br/&gt;을 열 수 없습니다.&lt;br/&gt;&lt;br/&gt;로그 출력이 &lt;b&gt;저장되지 않습니다!&lt;/b&gt;&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation> 쓰기 위해 &lt;nobr&gt;파일 &apos;%1&apos;&lt;br/&gt;을 열 수 없습니다.&lt;br/&gt;&lt;br/&gt;로그 출력이 &lt;b&gt;저장되지 않습니다!&lt;/b&gt;&lt;/nobr&gt;</translation>
</message>
@@ -3550,12 +3569,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>파일 이름이 서버 블랙리스트에 있습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>파일이 가상 파일에 예약된 확장자를 가짐</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>크기</translation>
</message>
@@ -3570,22 +3589,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>서버가 %1이(가) 없다고(아니라고) 보고함</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>파일 id</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3595,47 +3614,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>유효하지 않은 목적지로 옮겨짐, 복구</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>삭제가 허용되지 않음, 복구</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>데이터베이스를 읽는 중 오류 발생</translation>
</message>
@@ -3645,7 +3664,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>서버가 디렉토리 &apos;%1&apos;을(를) 읽는 중 오류에 대응함: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3686,44 +3705,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>암호화 정보가 없어서 %1 파일을 다운로드 할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>암호화 정보가 없어서 %1 파일을 다운로드 할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>발견 이후 파일이 변경되었습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>로컬 파일 이름 충돌로 인해 %1 파일을 다운로드 할 수 없습니다!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>로컬 파일 이름 충돌로 인해 %1 파일을 다운로드 할 수 없습니다!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>다운로드하면 사용 가능한 로컬 디스크 공간이 제한 밑으로 줄어 듭니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>디스크의 여유 공간이 %1보다 작습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>파일이 서버에서 삭제되었습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>파일을 완전히 다운로드 할 수 없습니다.</translation>
</message>
@@ -3733,12 +3752,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>서버가 %1이어야한다고 안내 했음에도 불구하고 다운로드한 파일이 비어 있습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>서버는 %1였으나 다운로드한 파일이 비어 있음.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>로컬 파일 이름 충돌로 인해 %1 파일을 저장할 수 없습니다!</translation>
</message>
@@ -3748,18 +3767,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>데이터베이스에 메타데이터를 쓰는 중 오류가 발생했습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4146,7 +4165,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>무시</translation>
</message>
@@ -4193,32 +4212,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud 경로:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>아이콘</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>공유 라벨</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud 경로:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>폴더: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 공유</translation>
</message>
@@ -4228,17 +4258,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>파일에 공유 권한이 없으므로 파일을 공유할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>내 링크 공유를 위한 암호를 입력하십시오:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>공유를 위한 암호가 필요함</translation>
</message>
@@ -4251,7 +4281,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>암호:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>링크 공유</translation>
</message>
@@ -4261,7 +4291,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>메모:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4276,7 +4306,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>만료 날짜:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>암호 설정</translation>
</message>
@@ -4286,7 +4316,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>만료:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>만료</translation>
</message>
@@ -4381,27 +4411,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>공유 링크 삭제</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>링크 공유 삭제 확인</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;공개 링크 공유 &lt;i&gt;%1&lt;/i&gt;를 정말로 삭제 하시겠습니까?&lt;/p&gt;&lt;p&gt;메모: 이 작업은 되돌릴 수 없습니다.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>삭제</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>취소</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>공개 링크</translation>
</message>
@@ -4409,7 +4439,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>사용자 또는 그룹과 공유: ...</translation>
</message>
@@ -4419,7 +4449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>전역 검색</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>링크 복사</translation>
</message>
@@ -4429,22 +4459,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>&apos;%1&apos;에 대한 결과 없음</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>공유를 위한 암호가 필요함</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>내 이메일 공유를 위한 암호 입력:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>당신과 공유합니다.</translation>
</message>
@@ -4452,7 +4482,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>사용자 이름</translation>
</message>
@@ -4462,62 +4492,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>편집 가능</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>편집할 수 있음</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>암호:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>만료:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>재공유 가능</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>받는 사람에게 메모</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>만료기한 설정</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>공유 해제</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>생성 가능</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>변경 가능</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>삭제 가능</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>암호 보호</translation>
</message>
@@ -4544,13 +4574,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>새 위치 선택 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>당신과 공유합니다.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>공유 옵션</translation>
</message>
@@ -4560,79 +4590,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1(으)로 공유</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>클립보드로 개인 링크 주소 복사</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>이메일로 개인 링크 보내기 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>이 파일을 다시 공유할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>이 폴더를 다시 공유할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>공개 링크 복사</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>내부 링크 복사</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>편집</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>브라우저에서 열기</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>문제 해결 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>이동 및 이름 변경 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>이동, 이름 변경 및 업로드 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>로컬 변경 사항 삭제</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>이동 및 업로드 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>삭제</translation>
</message>
@@ -5208,29 +5259,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>계정 추가</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>동기화 일시 정지</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>동기화 재개</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>설정</translation>
</message>
@@ -5240,22 +5291,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>%1 끝내기</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>전체 동기화 일시 정지</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>전체 동기화 재개</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5263,24 +5314,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 데스크톱 클라이언트&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;버전 %1. 더 많은 정보를 보려면 &lt;a href=&apos;%2&apos;&gt;여기&lt;/a&gt;를 클릭하세요.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;small&gt;&lt;p&gt;가상 파일 플러그인 사용: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;이 릴리스는 %1에 의해 제공되었습니다.&lt;/p&gt;</translation>
</message>
@@ -5288,22 +5339,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5311,7 +5362,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>모든 업로드 다시 시도</translation>
</message>
@@ -5344,22 +5395,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>계정 삭제 확인</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>연결 삭제</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>취소</translation>
</message>
@@ -6021,7 +6072,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>새 폴더</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6130,7 +6181,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6151,7 +6202,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6175,7 +6226,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6213,7 +6264,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>계정이 연결되지 않음</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>계정 동작</translation>
</message>
@@ -6223,18 +6274,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>계정 삭제</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>로그아웃</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>로그인</translation>
@@ -6248,52 +6299,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6379,12 +6430,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>다운로드 한 파일이 체크섬과 일치하지 않아 다시 시작됩니다. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6392,98 +6443,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>현재 계정</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>전체 동기화 재개</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>전체 동기화 일시 정지</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>계정 추가</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>새 계정 추가</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>설정</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>끝내기</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>현재 사용자 아바타</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>현재 사용자 상태가 접속 중임</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>현재 사용자 상태가 방해 금지임</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>현재 계정의 로컬 폴더 열기</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>연결됨</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>연결이 끊어졌습니다.</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>브라우저에서 Nextcloud Talk 열기</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>더 많은 앱</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>앱 메뉴</translation>
@@ -6504,7 +6550,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>더 많은 앱</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>브라우저에서 %1 열기</translation>
</message>
@@ -6515,7 +6566,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>더 많은 동작 보기</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6525,7 +6576,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 공유</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6551,7 +6602,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Git 개정 &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;에서 Qt %5, %6을 사용하여 %3, %4의 빌드&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts
index 19315d6a6..5d4dd3064 100644
--- a/translations/client_lt_LT.ts
+++ b/translations/client_lt_LT.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Šifravimo mnemonika</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Norėdami apsaugoti Jūsų kriptografinę tapatybę, mes ją užšifruojame 12 žodžių mnemonika. Įsiminkite ir saugokite žodžius. Jie bus reikalingi, jei norėsite prie savo paskyros pridėti kitus įrenginius (pvz., mobilųjį telefoną ar nešiojamąjį kompiuterį).</translation>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Atsijungta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Atjungta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Prijungta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Paslauga nepasiekiama</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Techninės priežiūros veiksena</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Tinklo klaida</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Konfigūracijos klaida</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Klausiama prisijungimo duomenų</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Nežinoma paskyros būsena</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Jei norite matyti daugiau veiklos, atidarykite programą Veikla.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Išeiti</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Tęsti</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Klaida gaunant prieigą prie konfigūracijos failo</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Įvyko klaida, nepavyko pasiekti konfigūracijos failo, esančio% 1. Įsitikinkite, kad Jūs turite teisę pasiekti šį failą.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Išjungti %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1198,8 +1215,8 @@ This action will abort any currently running synchronization.</source>
<translation>Serverio failo aptikimo atsakyme trūksta duomenų.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1946,12 +1963,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Pridėti aplanko sinchronizavimo ryšį</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Pridėti sinchronizavimo ryšį</translation>
</message>
@@ -1969,7 +1986,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Įveskite kelią iki lokalaus aplanko.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Pasirinkite šaltinio aplanką</translation>
</message>
@@ -1977,7 +1994,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Sukurti nuotolinį aplanką</translation>
</message>
@@ -1987,47 +2004,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Įveskite naujo aplanko pavadinimą, kuris bus sukurtas po &quot;% 1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Aplankas buvo sėkmingai sukurtas % 1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Nepavyko tapatumo nustatymas pasiekiant %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Nepavyko sukurti aplanko ant %1. Prašome patikrinkite.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Nepavyko įkelti katalogo. Klaida:% 1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Pasirinkite, jei norite sinchronizuoti šią paskyrą</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Šis aplankas jau yra sinchronizuojamas.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Jūs jau sinchronizuojate &lt;i&gt;%1&lt;/i&gt;, kuris yra tėvinis &lt;i&gt;%2&lt;/i&gt; katalogas.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2035,24 +2052,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2073,27 +2090,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Iš serverio negauta „E-Tag“ žymė, patikrinkite įgaliotąjį serverį/tinklų sietuvą.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Mes gavome kitą „E-Tag“ atnaujinimui. Pakrtosime kitą kartą.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Serveris grąžino neteisingą turinio rėžį</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Pasibaigė ryšiui skirtas laikas</translation>
</message>
@@ -2142,83 +2159,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Atnaujinimai</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Automatiškai tikrinti, ar nėra atnaujinimų </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanalas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabilus</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Paleisti iš naujo ir atnaujinti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Patikrinti, ar nėra aktyvių atnaujinimų</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Papildoma</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Patvirtinti, jei sinchronizuojami aplankai yra didesni nei</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Patvirtinti, jei sinchronizuojami nuotoliniai aplankai</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Rodyti sinchronizavimo aplankus failų naršyklės naršymo srityje</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Rodyti gedimų ataskaitą</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Taisyti &amp;nepaisomus failus</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Sukurti derinimo archyvą…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Serverio perspėjimai, reikalaujantys imtis veiksmų.</translation>
</message>
@@ -2228,49 +2247,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Keisti atnaujinimų kanalą?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Keisti atnaujinimų kanalą</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Atsisakyti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Sukurti derinimo archyvą</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip archyvai</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Derinimo archyvas sukurtas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Derinimo archyvas sukurtas ties %1</translation>
</message>
@@ -2628,7 +2647,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Klaida</translation>
</message>
@@ -2638,7 +2657,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Failas &apos;%1&apos;&lt;br/&gt;negali būti atidarytas rašymui.&lt;br/&gt;&lt;br/&gt;Įvykių žurnalo išvestis &lt;b&gt;negali&lt;/b&gt;būti išsaugota!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3521,12 +3540,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>dydis</translation>
</message>
@@ -3541,22 +3560,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>failo id</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3566,47 +3585,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Klaida skaitant duomenų bazę</translation>
</message>
@@ -3616,7 +3635,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3657,44 +3676,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Failo %1 atsisiųsti nepavyko, nes trūksta šifravimo informacijos.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Aptikus failą, jis buvo pakeistas</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Failo %1 nepavyko atsisiųsti dėl kompiuterio failo nesuderinamumo!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Atsisiuntimas sumažins laisvos vietos diske žemiau leistinos ribos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Laisvos vietos diske yra mažiau nei %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Failas buvo ištrintas iš serverio</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Nepavyko pilnai atsisiųsti failo.</translation>
</message>
@@ -3704,12 +3723,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Atsisiųstas failas yra tuščias nepaisant to, kad serveris paskelbė, jog failas turėjo būti %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Failo %1 nepavyko išsaugoti dėl kompiuterio failo nesuderinamumo!</translation>
</message>
@@ -3719,18 +3738,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Klaida rašant metaduomenis į duomenų bazę</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4117,7 +4136,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Atmesti</translation>
</message>
@@ -4164,32 +4183,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud kelias:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Piktograma</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>viešinio etiketė</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud kelias:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Aplankas: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 dalinimasis</translation>
</message>
@@ -4199,17 +4229,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Failu dalintis negalima, bet jam nebuvo suteikta teisė dalintis.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Prašome įveskite slaptažodį bendrinamai nuorodai:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Reikalingas bendrinimo slaptažodis</translation>
</message>
@@ -4222,7 +4252,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Slaptažodis:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Bendrinimo nuoroda</translation>
</message>
@@ -4232,7 +4262,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Pastaba:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4247,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Galiojimo pabaiga:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4257,7 +4287,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Galioja iki:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4352,27 +4382,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ištrinti bendrinimo nuorodą</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Patvirtinkite dalinimosi nuorodos trynimą</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ar tikrai norite ištrinti viešąją bendrinimo nuorodą &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Pastaba: Šio veiksmo negalima bus atšaukti.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Ištrinti</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Atsisakyti</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Viešoji nuoroda</translation>
</message>
@@ -4380,7 +4410,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Bendrinti su naudotojais ar grupėmis ...</translation>
</message>
@@ -4390,7 +4420,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopijuoti nuorodą</translation>
</message>
@@ -4400,22 +4430,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>„%1“ negrąžino jokių rezultatų</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Aš pradėjau kai ką bendrinti su jumis</translation>
</message>
@@ -4423,7 +4453,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Naudotojo vardas</translation>
</message>
@@ -4433,62 +4463,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>gali redaguoti</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Gali pakartotinai bendrinti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Nustoti bendrinti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Gali kurti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Gali keisti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Gali trinti</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4515,13 +4545,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Aš pradėjau kai ką bendrinti su jumis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Bendrinimo parinktys</translation>
</message>
@@ -4531,79 +4561,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Bendrinti per %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopijuoti privačią nuorodą į mainų sritį</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Siųsti privačią nuorodą el. paštu…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Pakartotinai dalintis failu negalima</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopijuoti viešąją nuorodą</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopijuoti vidinę nuorodą</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Taisyti</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Atverti naršyklėje</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Perkelti ir pervadinti…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Ištrinti vietinius pakeitimus</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Ištrinti</translation>
</message>
@@ -5179,29 +5230,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Pridėti paskyrą</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Atverti pagrindinį dialogą</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pristabdyti sinchronizavimą</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Pratęsti sinchronizavimą</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Nustatymai</translation>
</message>
@@ -5211,22 +5262,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Išeiti iš %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5234,24 +5285,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 darbalaukio kliento programa&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versija %1. Išsamesnei informacijai, spustelėkite &lt;a href=&apos;%2&apos;&gt;čia&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Šį išleidimą pateikė %1&lt;/p&gt;</translation>
</message>
@@ -5259,22 +5310,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5282,7 +5333,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Pakartoti visus įkėlimus</translation>
</message>
@@ -5315,22 +5366,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Patvirtinti paskyros šalinimą</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Ar tikrai norite pašalinti ryšį su paskyra &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Pastaba:&lt;/b&gt; Tai &lt;b&gt;neištrins&lt;/b&gt; jokių failų.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Šalinti ryšį</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Atsisakyti</translation>
</message>
@@ -5992,7 +6043,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Naujas aplankas</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6101,7 +6152,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6122,7 +6173,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6146,7 +6197,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6184,7 +6235,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Paskyra neprijungta</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Veiksmai su paskyra</translation>
</message>
@@ -6194,18 +6245,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Šalinti paskyrą</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Atsijungti</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Prisijungti</translation>
@@ -6219,52 +6270,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6350,12 +6401,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6363,98 +6414,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Dabartinė paskyra</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Pridėti paskyrą</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Pridėti naują paskyrą</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Nustatymai</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Išeiti</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Paskyrų perjungiklis ir nustatymų meniu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Prijungta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Atjungta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Daugiau programėlių</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Programėlių meniu</translation>
@@ -6475,7 +6521,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Atverti bendrinimo dialogą</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Daugiau programėlių</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Atverti %1 naršyklėje</translation>
</message>
@@ -6486,7 +6537,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Rodyti daugiau veiksmų</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6496,7 +6547,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Bendrinti %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6522,7 +6573,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Pagaminta pagal Git redakciją &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;išleistą %3, %4 naudojant Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_lv.ts b/translations/client_lv.ts
index 543c3acc5..b25f3db57 100644
--- a/translations/client_lv.ts
+++ b/translations/client_lv.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>No gala līdz galam šifrēšanas mnemonika</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Izrakstījies</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Atvienojies</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Savienojies</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Serviss nav pieejams</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Uzturēšanas režīms</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Tīkla kļūda</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Konfigurācijas kļūda</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Pieprasa atkreditāciju</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Nezināms konta stāvoklis</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Kļūda piekļūstot konfigurācijas datnei</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Notika kļūda piekļūstot konfigurācijas datnei %1. Lūdzu pārliecinieties, ka datne ir pieejama no jūsu konta.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Iziet %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation>Servera datņu atklāšanas atbildei nav datu.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1931,12 +1948,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation type="unfinished"/>
</message>
@@ -1954,7 +1971,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation type="unfinished"/>
</message>
@@ -1962,7 +1979,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Izveidot attālo mapi </translation>
</message>
@@ -1972,47 +1989,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2020,24 +2037,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2058,27 +2075,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -2127,83 +2144,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Atjauninājumi</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Papildus</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2213,49 +2232,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2607,7 +2626,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Kļūda</translation>
</message>
@@ -2617,7 +2636,7 @@ Logs will be written to %1</source>
<translation>Datni &apos;%1&apos;&lt;br/&gt;nevar atvērt rakstīšanai.&lt;br/&gt;&lt;br/&gt;Žurnāla izvads var būt&lt;b&gt;nesaglabāts&lt;/b&gt; !&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3498,12 +3517,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3518,22 +3537,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3543,47 +3562,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3593,7 +3612,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3634,44 +3653,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
@@ -3681,12 +3700,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3696,18 +3715,18 @@ 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/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4094,7 +4113,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -4141,32 +4160,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>koplietošanas etiķete</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
@@ -4176,17 +4206,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4199,7 +4229,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4209,7 +4239,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4224,7 +4254,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4234,7 +4264,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4329,27 +4359,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Apstiprināt koplietošanas saites dzēšanu</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Dzēst</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Atcelt</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation type="unfinished"/>
</message>
@@ -4357,7 +4387,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4367,7 +4397,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4377,22 +4407,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
@@ -4400,7 +4430,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4410,62 +4440,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4492,13 +4522,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4508,79 +4538,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopēt privāto saiti starpliktuvē</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Rediģēt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Dzēst</translation>
</message>
@@ -5154,29 +5205,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Pievienot kontu</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Iestatījumi</translation>
</message>
@@ -5186,22 +5237,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5209,24 +5260,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Šo izlaidumu piegādāja %1&lt;/p&gt;</translation>
</message>
@@ -5234,22 +5285,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5257,7 +5308,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5290,22 +5341,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Atcelt</translation>
</message>
@@ -5967,7 +6018,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6076,7 +6127,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6097,7 +6148,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6121,7 +6172,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6159,7 +6210,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Konta darbības</translation>
</message>
@@ -6169,18 +6220,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Iziet</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Pieteikties</translation>
@@ -6194,52 +6245,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6325,12 +6376,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6338,98 +6389,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Pašreizējais konts</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Pievienot kontu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Iestatījumi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Savienojies</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Atvienojies</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Vairāk lietotnes</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6450,7 +6496,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Vairāk lietotnes</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Atvērt %1 pārlūkā</translation>
</message>
@@ -6461,7 +6512,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6471,7 +6522,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6497,7 +6548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Būvēta no Git revīzijas &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; uz %3, %4 izmantojot Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_mk.ts b/translations/client_mk.ts
index 8f5dc9d04..75119d257 100644
--- a/translations/client_mk.ts
+++ b/translations/client_mk.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Одјавен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Исклучен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Поврзан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Сервисот е недостапен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Мод за одржување</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Грешка во мрежата</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Грешка во конфигурацијата</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Побарување на акредитиви</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Сметка со непознат статус</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>За повеќе активности отворете ја апликацијата со активности.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Продолжување би значело &lt;b&gt;бришење на ова подесување&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Продолжување би значело &lt;b&gt;игнорирање на ова подесување&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Излези</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Продолжи</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Грешка при пристапот до конфигурациската датотека</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Настана грешка при пристапувањето до конфигурациската датотека на %1. Бидете сигурни дека вашата сметка може да пристапи до конфигурациската датотека.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Излези %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1198,8 +1215,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1933,12 +1950,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Додади папка за синхронизација</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Додади синхронизација</translation>
</message>
@@ -1956,7 +1973,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Внесете патека до локална папка.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Изберете изворна папка</translation>
</message>
@@ -1964,7 +1981,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Направете папка на серверот</translation>
</message>
@@ -1974,47 +1991,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Внесете го името на новата папка &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Папка е успешно креирана на %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Неуспешна автентификација пристапувајќи кон %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Неуспешно креирање папка на %1. Проверете рачно.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Неуспешно листање на папката. Грешка: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Оваа папка веќе е синхронизирана.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Веќе ја имате синхронизирана &lt;i&gt;%1&lt;/i&gt;, која се наоѓа во папката &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Веќе ја имате синхронизирана &lt;i&gt;%1&lt;/i&gt;, која се наоѓа во папката &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2022,24 +2039,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(експериментално)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Не се достапни виртуелни датотеки за избраната папка</translation>
</message>
@@ -2060,27 +2077,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Времето за поврзување истече</translation>
</message>
@@ -2129,83 +2146,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Ажурирања</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Автоматски проверувај за ажурирања</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Канал</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>стабилна</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>бета</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Рестартирај &amp;&amp; Ажурирај</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Провери за ажурирање сега</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Напредно</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Побарај потврда за синхронизација на папки поголеми од</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Побарај потврда за синхроницација на надворешни складишта</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Покажи ги папките што се синхронизираат во навигационата лента на &amp;прелистувачот</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Измени &amp;игнорирани датотеки</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Креирај Debug архива ...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Известувања од серверот за кој е потребно внимание.</translation>
</message>
@@ -2215,17 +2234,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Промена на каналот за ажурирање?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2233,32 +2252,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Имајте во предвид дека ова само избира врзии што ќе се преземат од базенот и дека нема враќање назад: Значи, враќањето од бета-каналот до стабилниот канал обично не може да се направи веднаш и треба да се чека стабилна верзија која е понова од тековно инсталираната бета-верзија.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Промена на каналот за ажурирање</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Откажи</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Креирај Debug архива</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip Архиви</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Креирана Debug архива</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Debug архива креирана на %1</translation>
</message>
@@ -2614,7 +2633,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
@@ -2624,7 +2643,7 @@ Logs will be written to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3507,12 +3526,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Името на датотеката е на црна листа на серверот.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>големина</translation>
</message>
@@ -3527,22 +3546,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>id на датотека</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3552,47 +3571,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Не е дозволено бришење, враќање</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Грешка при вчитување на податоци од датабазата</translation>
</message>
@@ -3602,7 +3621,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Серверот одговори со грешка при читање на папката &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3643,44 +3662,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Слободниот простор на дискот е помалку од %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Датотеката е избришана од серверот</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
@@ -3690,12 +3709,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3705,18 +3724,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Грешка при запишување на метаподатоци во базата со податоци</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4103,7 +4122,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Отфрли</translation>
</message>
@@ -4150,32 +4169,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud патека:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Икона</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>ознака на споделувањето</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud патека:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Папка: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Споделување</translation>
</message>
@@ -4185,17 +4215,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Внесете лозинка за да линкот кој го споделувате:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Потребна е лозинка за споделувањето</translation>
</message>
@@ -4208,7 +4238,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Лозинка:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Сподели линк</translation>
</message>
@@ -4218,7 +4248,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Забелешка:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4233,7 +4263,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Рок на траење:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4243,7 +4273,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Истекува</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4338,27 +4368,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Избриши го линкот за споделување</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Потврди бришење на линк за споделување</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Дали сте сигурни дека сакате да го отстраните јавниот линк за споделување &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Забелешка: Оваа акција неможе да се врати.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Избриши</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Откажи</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Јавен линк</translation>
</message>
@@ -4366,7 +4396,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Сподели со корисници или групи ...</translation>
</message>
@@ -4376,7 +4406,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Пребарај глобално</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Копирај линк</translation>
</message>
@@ -4386,22 +4416,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Нема резултати за &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Споделив нешто со вас</translation>
</message>
@@ -4409,7 +4439,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Корисничко име</translation>
</message>
@@ -4419,62 +4449,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>може да се измени</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Може да се пресподели</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Не споделувај</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Може да креира</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Може да се промени</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Може да брише</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4501,13 +4531,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Избери нова локација ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Споделив нешто со вас</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Опции за споделување</translation>
</message>
@@ -4517,79 +4547,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Сподели преку %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Копирај приватен линк во клипборд</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Испрати приватен линк преку е-пошта ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Повторно споделување на оваа датотека не е дозволено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Повторно споделување на оваа папка не е дозволено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Копирај јавен линк</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Копирај внатрешен линк</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Уреди</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Отвори во прелистувач</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Реши конфликт ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Премести и преименувај ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Премести, преименувај и прикачи ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Избриши ги локалните измени</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Премести и прикачи ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Избриши</translation>
</message>
@@ -5165,29 +5216,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Додади сметка</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Отвори во прозорец</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Паузирај синхронизација</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Продолжи синхронизација</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Параметри</translation>
</message>
@@ -5197,22 +5248,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Излез %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Паузирај ја синхронизацијата за сите</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Продолжи ја синхронизацијата за сите</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5220,24 +5271,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Клиент за компјутер&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Верзија %1. За повеќе информации кликнете &lt;a href=&apos;%2&apos;&gt;тука&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Ова издание е обезбедено од %1&lt;/p&gt;</translation>
</message>
@@ -5245,22 +5296,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5268,7 +5319,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Повтори ги сите прикачувања</translation>
</message>
@@ -5301,22 +5352,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Потврди отстранување на сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Отстрани врска</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Откажи</translation>
</message>
@@ -5978,7 +6029,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Нова папка</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6087,7 +6138,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6108,7 +6159,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6132,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6170,7 +6221,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Сметката не е поврзана</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6180,18 +6231,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Отстрани сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Одјава</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Најава</translation>
@@ -6205,52 +6256,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6336,12 +6387,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6349,98 +6400,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Моментална сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Продолжи ја синхронизацијата за сите</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Паузирај ја синхронизацијата за сите</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Додади сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Додади нова сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Параметри</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Излез</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Аватар на оваа сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Отвори ја локалната папка на оваа сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Поврзан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Исклучен</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Отвори разговор во прелистувач</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Повеќе апликации</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Мени со апликации</translation>
@@ -6461,7 +6507,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Повеќе апликации</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Отвори %1 во прелистувач</translation>
</message>
@@ -6472,7 +6523,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Прикажи повеќе акции</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6482,7 +6533,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Сподели %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6508,7 +6559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Изграден од Git ревизија &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; на %3, %4 со користење на Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 593635780..65c735893 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Åpne %1 lokalt</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Ende-til-ende -kryptering mnemonic</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>For å beskytte din kryptografiske identitet, krypterer vi den med en mnemonic med 12 ordbok ord. Vennligst noter disse ned og oppbevar dem trygt. De vil være nødvendige for å legge til andre enheter på kontoen din (som mobiltelefonen eller den bærbare datamaskinen).</translation>
</message>
@@ -734,47 +752,47 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Tilkoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Tjeneste utilgjengelig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Vedlikeholdsmodus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Nettverksfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Konfigurasjonsfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Spør etter legitimasjon</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Ukjent kontotilstand</translation>
</message>
@@ -782,17 +800,17 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>For flere aktiviteter, åpne Aktivitetsappen.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Filer fra ignoreringslisten så vel som symbolske lenker synkroniseres ikke.</translation>
</message>
@@ -853,42 +871,42 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Å fortsette betyr &lt;b&gt;slette disse innstillingene&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Å fortsette betyr &lt;b&gt;ignorere disse innstillingene&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Enkelte innstillinger er konfigurert i nyere versjon av denne klienten og bruker funksjoner som ikke er tilgjengelig i denne versjonen.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Konfigurasjonsfil er allerede sikkerhetskopiert til &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Avslutt</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Fortsett</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Feil ved lesing av konfigurasjonsfil</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Avslutt %1</translation>
</message>
@@ -930,7 +948,6 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1203,8 +1220,8 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1941,12 +1958,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Legg til mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Legg til tilkobling for synkronisering</translation>
</message>
@@ -1964,7 +1981,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Legg inn stien til den lokale mappen.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Velg kildemappe</translation>
</message>
@@ -1972,7 +1989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Opprett ekstern mappe</translation>
</message>
@@ -1982,47 +1999,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Oppgi navnet på den nye mappen som skal opprettes under &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Mappen ble opprettet på %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autentisering feilet ved tilgang til %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Klarte ikke å opprette mappen på %1. Sjekk manuelt.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Klarte ikke å liste en mappe. Feil: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Velg dette for å synkronisere en hel konto</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Denne mappen synkroniseres allerede.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Du synkroniserer allerede &lt;i&gt;%1&lt;/i&gt;, som er foreldremappe for &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2030,24 +2047,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2068,27 +2085,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen E-Tag mottatt fra server. Sjekk proxy/gateway.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottok en forskjellig E-Tag for å fortsette. Prøver igjen neste gang.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Serveren returnerte feil content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Tidsavbrudd ved tilkobling</translation>
</message>
@@ -2137,83 +2154,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Oppdateringer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Omstart &amp;&amp; Oppdater</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avansert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Be om bekreftelse før synkronisering av mapper større enn</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Be om bekreftelse før synkronisering av eksterne lagre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Vis synkroniseringsmapper i &amp;Utforskers navigasjonspanel</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Vis &amp;krasj-rapportering</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Rediger &amp;ignorerte filer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Servervarsler som krever oppmerksomhet.</translation>
</message>
@@ -2223,49 +2242,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2619,7 +2638,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Feil</translation>
</message>
@@ -2629,7 +2648,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Fil &apos;%1&apos;&lt;br/&gt;kan ikke åpnes for skriving.&lt;br/&gt;&lt;br/&gt;Loggen kan &lt;b&gt;ikke&lt;/b&gt; lagres!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3511,12 +3530,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3531,22 +3550,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3556,47 +3575,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3606,7 +3625,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3647,44 +3666,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Filen er endret siden den ble oppdaget</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Fil %1 kan ikke lastes ned på grunn av lokalt sammenfall av filnavn!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Nedlastingen ville redusert ledig lokal diskplass til under grensen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Ledig plass på disk er mindre enn %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Filen ble slettet fra serveren</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Hele filen kunne ikke lastes ned.</translation>
</message>
@@ -3694,12 +3713,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
</message>
@@ -3709,18 +3728,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4107,7 +4126,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Forkast</translation>
</message>
@@ -4154,32 +4173,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nextcloud-sti:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikon</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>Tittel for deling</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Tekst-etikett</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Mappe: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 deler</translation>
</message>
@@ -4189,17 +4219,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4212,7 +4242,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Passord:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Del lenke</translation>
</message>
@@ -4222,7 +4252,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Notat:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4237,7 +4267,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Utløpsdato:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Sett passord</translation>
</message>
@@ -4247,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Utløper:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4342,27 +4372,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Slett lenke til deling</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Slett</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Offentlig lenke</translation>
</message>
@@ -4370,7 +4400,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4380,7 +4410,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopier lenke</translation>
</message>
@@ -4390,22 +4420,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ingen resultater for &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Jeg delte noe med deg</translation>
</message>
@@ -4413,7 +4443,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Brukernavn</translation>
</message>
@@ -4423,62 +4453,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>kan endre</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Kan dele videre</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Avslutt deling</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>kan opprette</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Kan endre</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Kan slette</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4505,13 +4535,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Jeg delte noe med deg</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Alternativer for deling</translation>
</message>
@@ -4521,79 +4551,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopier privat lenke til utklippstavlen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<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/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopier offentlig lenke</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopier intern lenke</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Rediger</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Åpne i nettleser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Slett</translation>
</message>
@@ -5169,29 +5220,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Legg til en konto</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Åpne hovedvindu</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Innstillinger</translation>
</message>
@@ -5201,22 +5252,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5224,24 +5275,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5249,22 +5300,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5272,7 +5323,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Prøv alle opplastinger igjen</translation>
</message>
@@ -5305,22 +5356,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Bekreft fjerning av konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Fjern tilkobling</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -5982,7 +6033,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6091,7 +6142,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6112,7 +6163,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6136,7 +6187,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6174,7 +6225,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Kontoaktiviteter</translation>
</message>
@@ -6184,18 +6235,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Logg ut</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Logg inn</translation>
@@ -6209,52 +6260,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6340,12 +6391,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6353,98 +6404,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Nåværende konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Legg til en konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Innstillinger</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Avslutt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Tilkoblet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Flere apper</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6465,7 +6511,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Flere apper</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Åpne %1 i nettleser</translation>
</message>
@@ -6476,7 +6527,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6486,7 +6537,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6512,7 +6563,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 0cdda0135..22c4aed50 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>%1 lokaal openen</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Geheugensteun voor end-to-endversleuteling</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Om je cryptografische identiteit te beschermen, versleutelen we die met een geheugensteun van 12 woordenboekwoorden. Schrijf deze op en bewaar ze op een veilige plek. Ze zijn nodig om nieuwe apparaten aan je account toe te voegen (zoals je smartphone of laptop).</translation>
</message>
@@ -733,47 +751,47 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Dienst niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Onderhoudsmodus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Netwerkfout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Configuratiefout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Vragen naar inloggegevens</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Onbekende account-status</translation>
</message>
@@ -781,17 +799,17 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Voor meer activiteiten open de Activiteit app.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Bestanden op de negeerlijst en symbolische links worden niet gesynchroniseerd.</translation>
</message>
@@ -852,42 +870,42 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Doorgaan betekent &lt;b&gt;verwijderen van deze instellingen&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Doorgaan betekent &lt;b&gt;negeren van deze instellingen&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sommige instellingen zijn geconfigureerd in nieuwere versies van deze client en maken gebruik van functies die niet beschikbaar zijn in deze versie.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; Van het huidige configuratiebestand is al een back-up gemaakt op &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Stoppen</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Doorgaan</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Fout bij benaderen configuratiebestand</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Fout bij het benaderen van het configuratiebestand op %1. Zorg ervoor dat het bestand door je gebruiker kan worden benaderd.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Afsluiten %1</translation>
</message>
@@ -929,7 +947,6 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Bestand %1 heeft een ongeldige wijzigingstijd. Niet uploaden naar de server.</translation>
</message>
@@ -1202,8 +1219,8 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
<translation>In de reactie van de bestandenontdekker van de server ontbreken gegevens.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverfout: PROPFIND-antwoord heeft geen XML-opmaak!</translation>
</message>
@@ -1958,12 +1975,12 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Toevoegen mapsynchronisatie verbinding</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Toevoegen Sync verbinding</translation>
</message>
@@ -1981,7 +1998,7 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<translation>Geef het pad op naar de lokale map.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecteer de bronmap</translation>
</message>
@@ -1989,7 +2006,7 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Externe map aanmaken</translation>
</message>
@@ -1999,47 +2016,47 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<translation>Voer de naam van de hieronder te maken nieuwe map in &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Voer de naam van de hieronder te maken nieuwe map in &quot;%1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Map is succesvol aangemaakt op %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Authenticatie mislukt bij benaderen %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Aanmaken van de map op %1 mislukt. Controleer handmatig.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Tonen mappenlijst mislukt. Fout: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Kies dit om je volledige account te synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Deze map is al gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>U synchroniseert &lt;i&gt;%1&lt;/i&gt; al, dat is de bovenliggende map van &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Je synchroniseert &lt;i&gt;%1&lt;/i&gt; al, dat is de bovenliggende map van &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2047,24 +2064,24 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Gebruik virtuele bestanden in plaats van de content direct te downloaden %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimenteel)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Virtuele bestanden worden niet ondersteund voor Windows-partitie-hoofdmappen als lokale map. Kies een geldige submap onder de stationsletter.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuele bestanden zijn niet beschikbaar voor de geselecteerde map</translation>
</message>
@@ -2085,27 +2102,27 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>We ontvingen een onverwachte download Content-Lengte.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server retourneerde verkeerde content-bandbreedte</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -2154,83 +2171,85 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Updates</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Controleer automatisch op updates</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanaal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabiel</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Herstarten &amp;&amp; Bijwerken</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Controleer nu op update</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Geavanceerd</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Vraag bevestiging voordat mappen worden gedownload groter dan</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Vraag bevestiging voor synchronisatie van mappen op externe opslag</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Toon sync-mappen in het &amp;Verkenner navigatievenster</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>T&amp;onen crash reporter</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Bewerken &amp;genegeerde bestanden</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Debugarchief maken ...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Servermeldingen die aandacht nodig hebben.</translation>
</message>
@@ -2240,17 +2259,17 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Je kunt autostart niet uitschakelen omdat systeem-brede autostart is ingeschakeld.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Wijzigen bijwerkkanaal?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2259,32 +2278,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Merk op dat dit alleen selecteert van welke pool upgrades worden overgenomen en dat er geen downgrades zijn: teruggaan van het betakanaal naar het stabiele kanaal kan meestal niet onmiddellijk worden gedaan en dat betekent wachten op een stabiele versie die nieuwer is dan de momenteel geïnstalleerde betaversie.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Wijzigen bijwerkkanaal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Debugarchief maken</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip Archieven</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Debugarchief Aangemaakt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Debugarchief is gemaakt op %1</translation>
</message>
@@ -2649,7 +2668,7 @@ Logs worden geschreven naar %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Fout</translation>
</message>
@@ -2659,7 +2678,7 @@ Logs worden geschreven naar %1</translation>
<translation>&lt;nobr&gt;Bestand &apos;%1&apos;&lt;br/&gt;kan niet voor schrijven worden geopend.&lt;br/&gt;&lt;br/&gt;De log output kan &lt;b&gt;niet&lt;/b&gt; worden weggeschreven!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Bestand &quot;%1&quot;&lt;br/&gt;kan niet voor schrijven worden geopend.&lt;br/&gt;&lt;br/&gt;De log output kan &lt;b&gt;niet&lt;/b&gt; opgeslagen worden!&lt;/nobr&gt;</translation>
</message>
@@ -3548,12 +3567,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>De bestandsnaam staat op de negeerlijst van de server.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Bestand heeft een extensie gereserveerd voor virtuele bestanden.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>omvang</translation>
</message>
@@ -3568,22 +3587,22 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Server meldde geen %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>machtiging</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>bestand id</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Server rapporteerde nr %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3593,47 +3612,47 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Conflict bij het uploaden van sommige bestanden naar een map. Die betreffende conflicterende bestanden zullen worden gewist!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Conflict bij het uploaden van een map. Het wordt opgeruimd!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Conflict bij het uploaden van een bestand. Het wordt verwijderd!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Genegeerd vanwege de &quot;wat synchroniseren&quot; negeerlijst</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Niet toegestaan, omdat je geen machtiging hebt om submappen aan die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Niet toegestaan omdat je geen machtiging hebt om bestanden in die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Verplaatst naar ongeldig doel, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Fout bij lezen database</translation>
</message>
@@ -3643,7 +3662,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Server gaf een foutmelding bij lezen directory &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Server gaf een foutmelding bij lezen directory &quot;%1&apos;&quot;: %2</translation>
</message>
@@ -3684,44 +3703,44 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Bestand %1 kan niet worden gedownload, omdat crypto informatie ontbreekt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Bestand %1 kan niet worden gedownload, omdat crypto informatie ontbreekt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Het bestand is gewijzigd sinds het is gevonden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden gedownload, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden gedownload, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>De download zou de vrije lokale schijfruimte beperken tot onder de limiet</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Vrije schijfruimte is minder dan %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Bestand was verwijderd van de server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Het bestand kon niet volledig worden gedownload.</translation>
</message>
@@ -3731,12 +3750,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Het gedownloade bestand is leeg, maar de server meldde dat het %1 zou moeten zijn.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
</message>
@@ -3746,18 +3765,18 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Bestand %1 heeft een ongeldige wijzigingstijd gerapporteerd door de server. Bewaar het niet.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Fout bij bijwerken metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
@@ -4144,7 +4163,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Terzijde leggen</translation>
</message>
@@ -4191,32 +4210,43 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>OwnCloud Pad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Pictogram</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>label delen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud Pad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Tekstlabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Map: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Delen</translation>
</message>
@@ -4226,17 +4256,17 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen machtiging.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen machtiging.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Voer het wachtwoord in voor je deellink:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Wachtwoord voor deellink vereist</translation>
</message>
@@ -4249,7 +4279,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Wachtwoord:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Deel link</translation>
</message>
@@ -4259,7 +4289,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Opmerking:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Notitie</translation>
</message>
@@ -4274,7 +4304,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Vervaldatum:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Instellen wachtwoord</translation>
</message>
@@ -4284,7 +4314,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Verloopt:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Verloopt</translation>
</message>
@@ -4379,27 +4409,27 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Verwijder deellink</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Bevestig verwijderen deellink</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wil je de openbare deellink &lt;i&gt;%1&lt;/i&gt; echt verwijderen?&lt;/p&gt;&lt;p&gt;let op: Dit kan niet ongedaan worden gemaakt.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Verwijderen</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Openbare Link</translation>
</message>
@@ -4407,7 +4437,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Deel met gebruikers of groepen ...</translation>
</message>
@@ -4417,7 +4447,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Zoek door alles</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopiëren link </translation>
</message>
@@ -4427,22 +4457,22 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Geen resultaten voor &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Geen resultaten voor &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Wachtwoord voor delen vereist</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Voer het wachtwoord voor je e-mailserver in:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Ik deelde iets met u</translation>
</message>
@@ -4450,7 +4480,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Gebruikersnaam</translation>
</message>
@@ -4460,62 +4490,62 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>kan wijzigen</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Kan bewerken</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Opmerking:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Wachtwoord:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Verloopt:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Kan doordelen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Notitie voor ontvanger</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Instellen vervaldatum</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Stop met delen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Kan creëren</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Kan wijzigen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Kan verwijderen</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Wachtwoord beveiligd</translation>
</message>
@@ -4542,13 +4572,13 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Selecteer nieuwe locatie ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Ik deelde iets met u</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Deelopties</translation>
</message>
@@ -4558,79 +4588,100 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Delen via %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopiëren privé-link naar klembord</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Verstuur privélink per e-mail ---</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Verder delen van dit bestand is niet toegestaan</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Verder delen van deze map is niet toegestaan</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopieer openbare link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopieer interne link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Bewerken</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Openen in browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Oplossen conflict ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Verplaatsen en hernoemen ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Verplaatsen, hernoemen en uploaden ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Verwijder lokale aanpassingen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Verplaatsen en uploaden ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Verwijderen</translation>
</message>
@@ -5206,29 +5257,29 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Account toevoegen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Open het hoofdvenster</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pauzeer sync</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Vervolg sync</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Instellingen</translation>
</message>
@@ -5238,22 +5289,22 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Verlaat %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pauzeer sync voor iedereen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Vervolg sync voor iedereen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5261,24 +5312,24 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versie %1. Voor meer informatie klik &lt;a href=&apos;%2&apos;&gt;hier&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Gebruik makend van virtuele bestanden plugin: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Deze release is geleverd door %1&lt;/p&gt;</translation>
</message>
@@ -5286,22 +5337,22 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Fout bij het laden van providers.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Fout bij het zoeken van providers voor &apos;%1&apos;. Error: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Fout bij het zoeken naar &apos;%2&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Fout bij het zoeken naar &apos;%1&apos;. Error: %2</translation>
</message>
@@ -5309,7 +5360,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Probeer alle uploads opnieuw</translation>
</message>
@@ -5342,22 +5393,22 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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 je 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 verwijder je &lt;b&gt;geen&lt;/b&gt; bestanden.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Verwijderen verbinding</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
@@ -6019,7 +6070,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Nieuwe map</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6128,7 +6179,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Kon niet verbinden met database.</translation>
</message>
@@ -6149,7 +6200,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Zoek in bestanden, berichten, afspraak ...</translation>
</message>
@@ -6173,7 +6224,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Laad meer resultaten</translation>
</message>
@@ -6211,7 +6262,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Account niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Accountacties</translation>
</message>
@@ -6221,18 +6272,18 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Verwijder Account</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Status instellen</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Afmelden</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Meld u aan</translation>
@@ -6246,52 +6297,52 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Online status</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Afwezig</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Niet storen</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Onzichtbaar</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Statusbericht</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Wat is je status?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Statusbericht wissen na</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Statusbericht wissen</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Statusbericht instellen</translation>
</message>
@@ -6377,12 +6428,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Het gedownloade bestand komt niet overeen met het controlegetal. Het wordt opnieuw verwerkt. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Het header controlegetal bevat een onbekend controlegetal type &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Het gedownloade bestand komt niet overeen met het controlegetal. Het wordt opnieuw verwerkt. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6390,98 +6441,93 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud desktop hoofddialoog</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Huidige account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Hervat de synchronisatie voor iedereen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Synchronisatie voor iedereen onderbreken</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Gebruikersstatus instellen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Account toevoegen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Nieuw account toevoegen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Instellingen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Afsluiten</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Huidige gebruikersavatar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Huidige gebruikersstatus is online</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Huidige gebruikersstatus is niet storen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Accountswitcher en instellingenmenu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Open lokale map van huidig account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Verbonden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Open Nextcloud Talk in browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Meer apps</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Apps menu</translation>
@@ -6502,7 +6548,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Open het dialoogvenster voor delen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Meer apps</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
@@ -6513,7 +6564,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Toon meer acties</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Samengevoegde zoekresultaten lijst</translation>
</message>
@@ -6523,7 +6574,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Deel %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Bestandsactiviteit</translation>
</message>
@@ -6549,7 +6600,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Gebouwd vanaf Git revisie &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; op %3, %4 gebruik makend van Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_oc.ts b/translations/client_oc.ts
index b1aa82ad8..35e0b02b4 100644
--- a/translations/client_oc.ts
+++ b/translations/client_oc.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Dobrir %1 localement</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemonic de chiframent del cap a la fin</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servidor indisponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Mòde mentenença</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Error de ret</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Error de configuracion</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Demanda d’identificants</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estat del compte desconegut</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Los fichièrs de la lista d’ignorar e los ligams simbolics son pas sincronizats.</translation>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Daissar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Contunhar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Error d’accès al fichièr de configuracion</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Quitar %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1929,12 +1946,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Apondre connexion de sincro. dossièr</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation type="unfinished"/>
</message>
@@ -1952,7 +1969,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation type="unfinished"/>
</message>
@@ -1960,7 +1977,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crear un repertòri distant</translation>
</message>
@@ -1970,47 +1987,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2018,24 +2035,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2056,27 +2073,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -2125,83 +2142,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Mesas a jorn</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Verificar &amp;automaticament las mesas a jorn</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Canal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>estable</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reaviar e metre a jorn</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Verificar las mesas a jorn ara</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avançat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Demandar una confirmacion abans de sincronizar dossièrs de mai de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>Mo</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Demandar una confirmacion abans de sincronizar los dossièrs extèrns</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Modificar los fichièrs &amp;ignorats</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Crear un archiu de debugatge…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Las notificacions del servidor que demanda vòstra atencion.</translation>
</message>
@@ -2211,49 +2230,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Anullar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Crear un archiu de debugatge</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Archius ZIP</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2605,7 +2624,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -2615,7 +2634,7 @@ Logs will be written to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3496,12 +3515,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>talha</translation>
</message>
@@ -3516,22 +3535,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>permission</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3541,47 +3560,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3591,7 +3610,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3632,44 +3651,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
@@ -3679,12 +3698,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3694,18 +3713,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Error en escrivent las metadonadas dins la basa de donadas</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4092,7 +4111,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Regetar</translation>
</message>
@@ -4139,32 +4158,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Camin ownCloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Icòna</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>apelacion del partatge</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Camin Nextcloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Dossièr : %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 en partatge</translation>
</message>
@@ -4174,17 +4204,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Lo fichièr pòt pas èsser partejat perque es partejat sens las permission de partatge.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Mercés de picar un senhal pel ligam de partatge :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Protegir amb senhal</translation>
</message>
@@ -4197,7 +4227,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Senhal :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Partejar lo ligam</translation>
</message>
@@ -4207,7 +4237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nòta :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Nòta</translation>
</message>
@@ -4222,7 +4252,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Data d&apos;expiracion :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Definir senhal</translation>
</message>
@@ -4232,7 +4262,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Expira lo :</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4327,27 +4357,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmatz la supression del ligam de partatge</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Volètz vertadièrament suprimir lo ligam public de partatge &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;Nòta : aquesta accion pòt pas èsser anullada.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Suprimir</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Anullar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Ligam public</translation>
</message>
@@ -4355,7 +4385,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Partejar amb d&apos;utilizaires o gropes…</translation>
</message>
@@ -4365,7 +4395,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copiar lo ligam</translation>
</message>
@@ -4375,22 +4405,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Cap de resultat per « %1 »</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Ai partejat quicòm amb tu</translation>
</message>
@@ -4398,7 +4428,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nom d’utilizaire</translation>
</message>
@@ -4408,62 +4438,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Permetre las modificacions</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Pòt modificar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Nòte :</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Senhal :</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Permetre lo repartatge</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Partejar pas mai</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Permetre las creacions</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Permetre los cambiaments</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Permetre las supressions</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4490,13 +4520,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Ai partejat quicòm amb tu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opcions de partatge</translation>
</message>
@@ -4506,79 +4536,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Partejar amb %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Activitat</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar lo ligam privat al quichapapièr</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Enviar un ligam privat per mail …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Tornar partejar aqueste</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiar lo ligam public</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copiar lo ligam intèrn</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Modificar</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Dobrir dins lo navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Suprimir</translation>
</message>
@@ -5154,29 +5205,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Apondre un compte</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Dobrir fenèstra principala</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Suspendre la sincro.</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Reprendre la sincro.</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
@@ -5186,22 +5237,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Quitar %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Reprendre la sincro. per totes</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5209,24 +5260,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Client de burèu %1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Version %1. Per mai d’informacion clicatz &lt;a href=&apos;%2&apos;&gt;aquí&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Usatge extension pels fichièrs virtuals : %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Aquesta version es provesida per %1&lt;/p&gt;</translation>
</message>
@@ -5234,22 +5285,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5257,7 +5308,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Tornar enviar totes los fichièrs</translation>
</message>
@@ -5290,22 +5341,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Confirmatz la supression del compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Suprimir la connexion</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Anullar</translation>
</message>
@@ -5967,7 +6018,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Dossièr novèl</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6076,7 +6127,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6097,7 +6148,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6121,7 +6172,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6159,7 +6210,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Compte pas connectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Accions del compte</translation>
</message>
@@ -6169,18 +6220,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Levar compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Desconnexion</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Se connectar</translation>
@@ -6194,52 +6245,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>En linha</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Absent</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Desrengar pas</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Invisible</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Messatge d’estatut</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Quin es vòstre estatut ?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6325,12 +6376,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6338,98 +6389,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Compte actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Reprendre la sincro. per totes</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Suspendre la sincro. per totes</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Apondre un compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Apondre un compte novèl</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Quitar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Mai d’app</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menú d’aplicacion</translation>
@@ -6450,7 +6496,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Dobrir fenèstra de partatge</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Mai d’app</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
@@ -6461,7 +6512,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Veire mai d’accions</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6471,7 +6522,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Partejar %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6497,7 +6548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Construit de la revision Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; sus %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index dbb7f4ee7..be72c9334 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Otwórz lokalnie %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>W %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Odrzuć</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Otwórz okno udostępniania</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Klucz szyfrowania end to end</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Aby chronić Twoją tożsamość kryptograficzną, szyfrujemy ją kluczem składającym się z 12 wyrazów. Hasło zachowaj w bezpiecznym miejscu. Będzie ono potrzebne do dodania innych urządzeń do Twojego konta (takich jak telefon komórkowy lub laptop).</translation>
</message>
@@ -734,47 +752,47 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Wylogowany</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Połączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Usługa niedostępna</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Tryb konserwacji</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Błąd sieci</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Błąd konfiguracji</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Zapytanie o poświadczenia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Nieznany status konta</translation>
</message>
@@ -782,17 +800,17 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Aby uzyskać więcej informacji o działaniach, otwórz aplikację Aktywność.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation>Pobieranie aktywności…</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Pliki z listy ignorowanych oraz dowiązania symboliczne nie są synchronizowane.</translation>
</message>
@@ -853,42 +871,42 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Kontynuacja będzie oznaczać &lt;b&gt;usunięcie tych ustawień&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Kontynuacja będzie oznaczać &lt;b&gt;zignorowanie tych ustawień&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Niektóre ustawienia zostały skonfigurowane w nowszych wersjach tego klienta i używają funkcji, które nie są dostępne w tej wersji.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Bieżący plik konfiguracyjny został już utworzony w &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Wyjdź</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Kontynuuj</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Błąd dostępu do pliku konfiguracyjnego</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Wystąpił błąd podczas uzyskiwania dostępu do pliku konfiguracyjnego w %1. Upewnij się, że użytkownik może uzyskać dostęp do pliku.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Zamknij %1</translation>
</message>
@@ -930,7 +948,6 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Plik %1 ma nieprawidłowy czas modyfikacji. Nie wysyłaj na serwer.</translation>
</message>
@@ -1203,8 +1220,8 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<translation>Odpowiedź serwera: Nie można odnaleźć danych</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Błąd serwera: odpowiedź PROPFIND nie ma formatu XML!</translation>
</message>
@@ -1960,12 +1977,12 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Dodaj katalog synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Dodaj połączenie synchronizacji</translation>
</message>
@@ -1983,7 +2000,7 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<translation>Wpisz ścieżkę do katalogu lokalnego.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Wybierz katalog źródłowy</translation>
</message>
@@ -1991,7 +2008,7 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Dodaj katalog zdalny</translation>
</message>
@@ -2001,47 +2018,47 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<translation>Wpisz nazwę dla nowego katalogu, utworzonego poniżej &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Wpisz nazwę dla nowego katalogu, utworzonego poniżej &quot;%1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Katalog został utworzony pomyślnie w %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Uwierzytelnianie nie powiodło się podczas uzyskiwania dostępu do %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Nie udało się utworzyć katalogu w %1. Sprawdź ręcznie.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Nie udało się wyświetlić listy katalogów. Błąd: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Wybierz to, aby zsynchronizować całe konto</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Ten katalog jest już synchronizowany.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Synchronizujesz już &lt;i&gt;%1&lt;/i&gt;, który jest katalogiem nadrzędnym &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Synchronizujesz już &lt;i&gt;%1&lt;/i&gt;, który jest podkatalogiem &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2049,24 +2066,24 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Użyj plików wirtualnych zamiast bezpośrednio pobierać ich zawartość %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(eksperymentalne)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Pliki wirtualne nie są obsługiwane w przypadku katalogów głównych partycji Windows jako katalogu lokalnego. Wybierz prawidłowy podkatalog według litery dysku.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Pliki wirtualne nie są dostępne dla wybranego katalogu</translation>
</message>
@@ -2087,27 +2104,27 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Ponowna próba następnym razem.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Otrzymano niespodziewanie dużą zawartość do pobrania.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Serwer zwrócił błędny zakres zawartości</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -2156,83 +2173,85 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<translation>Pokaż powiadomienia połączeń</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Aktualizacje</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Automatyczne sprawdzanie aktualizacji</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanał</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabilny</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Uruchom ponownie i aktualizuj</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Sprawdź aktualizację</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Zaawansowane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Zapytaj o potwierdzenie przed synchronizacją katalogów większych niż</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Zapytaj o potwierdzenie przed synchronizacją zewnętrznych magazynów</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Pokaż katalog synchronizacji w oknie &amp;Exploratora</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Pokaż &amp;raport awarii</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Edytuj pliki ign&amp;orowane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Utwórz archiwum debugowania…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Powiadomienia serwera, które wymagają uwagi.</translation>
</message>
@@ -2242,17 +2261,17 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one
<translation>Pokaż dialogi w powiadomieniu połączenia.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Nie można wyłączyć autostartu, ponieważ autostart całego systemu jest włączony.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Zmienić kanał aktualizacji?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Zwróć uwagę, że wybiera to tylko, z której puli aktualizacje są pobierane oraz że nie można powrócić do niższej wersji. Więc powrót z kanału beta do stabilnego zwykle nie może być wykonany natychmiast i oznacza to oczekiwanie na stabilną wersję, która jest nowsza niż aktualnie zainstalowana wersja beta.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Zmień kanał aktualizacji</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Utwórz archiwum debugowania</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Archiwa Zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Utworzono archiwum debugowania</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Archiwum debugowania jest utworzone w %1</translation>
</message>
@@ -2647,7 +2666,7 @@ Dzienniki zostaną zapisane w %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
@@ -2657,7 +2676,7 @@ Dzienniki zostaną zapisane w %1</translation>
<translation>&lt;nobr&gt;Plik &apos;%1&apos;&lt;br/&gt;nie może zostać otwarty do zapisu.&lt;br/&gt;&lt;br/&gt;Dane wyjściowe dziennika &lt;b&gt;nie&lt;/b&gt; mogą być zapisane!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Plik &quot;%1&quot;&lt;br/&gt;nie może być otwarty do zapisu.&lt;br/&gt;&lt;br/&gt;Dane wyjściowe dziennika &lt;b&gt;nie&lt;/b&gt; mogą być zapisane!&lt;/nobr&gt;</translation>
</message>
@@ -3546,12 +3565,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Nazwa pliku jest na czarnej liście na serwerze.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Plik ma rozszerzenie zarezerwowane dla plików wirtualnych.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>rozmiar</translation>
</message>
@@ -3566,22 +3585,22 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>serwer zgłosił brak %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>pozwolenie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>id pliku</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Serwer zgłosił brak %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Nie można zsynchronizować z powodu nieprawidłowego czasu modyfikacji</translation>
</message>
@@ -3591,47 +3610,47 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Konflikt podczas wysyłania niektórych plików do katalogu. Konfliktowe zostaną wyjaśnione!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Konflikt podczas wysyłania katalogu. To się wyjaśni!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Konflikt podczas wysyłania pliku. Zostanie usunięty!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorowane z powodu czarnej listy &quot;Wybierz co synchronizować&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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 do tego katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wysyłanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Przeniesiono do nieprawidłowego obiektu, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Błąd podczas odczytu bazy danych</translation>
</message>
@@ -3641,7 +3660,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Serwer odpowiedział z błędem podczas odczytu katalogu &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Serwer odpowiedział z błędem podczas odczytu katalogu &quot;%1&quot; : %2</translation>
</message>
@@ -3682,44 +3701,44 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Nie można pobrać pliku %1 z powodu braku informacji o szyfrowaniu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Nie można pobrać pliku %1 z powodu braku informacji o szyfrowaniu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>W trakcie wyszukiwania plik uległ zmianie</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Nie można pobrać pliku %1 z powodu konfliktu nazwy pliku lokalnego!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Pobranie zmniejszyłoby wolne miejsce na dysku lokalnym poniżej limitu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Wolne miejsce na dysku jest mniejsze niż %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Plik został usunięty z serwera</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Plik nie mógł być całkowicie pobrany.</translation>
</message>
@@ -3729,12 +3748,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Pobrany plik jest pusty, mimo że serwer stwierdził, że powinien być %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Pobrany plik jest pusty, ale serwer odpowiedział, że powinien mieć %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Nie można zapisać pliku %1 z powodu lokalnego konfliktu nazwy pliku!</translation>
</message>
@@ -3744,18 +3763,18 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Błąd podczas zapisu metadanych do bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Plik %1 ma nieprawidłowy czas modyfikacji zgłoszony przez serwer. Nie zapisuj go.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Błąd podczas aktualizowania metadanych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie używany</translation>
</message>
@@ -4142,7 +4161,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Odpowiedz</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Odrzuć</translation>
</message>
@@ -4189,32 +4208,43 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Ścieżka ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>udostępnij etykietę</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Ścieżka Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Etykieta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Katalog: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Udostępnianie %1</translation>
</message>
@@ -4224,17 +4254,17 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Nie można udostępnić pliku, ponieważ nie ma uprawnień do udostępniania.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Nie można udostępnić pliku, ponieważ nie ma uprawnień do udostępniania.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Wprowadź hasło do udostępnionego linku:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Wymagane hasło do udostępnienia</translation>
</message>
@@ -4247,7 +4277,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Hasło:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Udostępnij link</translation>
</message>
@@ -4257,7 +4287,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Notatka:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Notatka</translation>
</message>
@@ -4272,7 +4302,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Data wygaśnięcia:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Ustaw hasło</translation>
</message>
@@ -4282,7 +4312,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Wygasa:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Wygasa</translation>
</message>
@@ -4377,27 +4407,27 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Usuń link udostępnienia</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Potwierdź usunięcie linku udostępniania</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy na pewno chcesz usunąć udostępniony link publiczny &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Uwaga: Tej czynności nie można cofnąć.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Usuń</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Link publiczny</translation>
</message>
@@ -4405,7 +4435,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Udostępnij użytkownikom lub grupom…</translation>
</message>
@@ -4415,7 +4445,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Szukaj globalnie</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopiuj link</translation>
</message>
@@ -4425,22 +4455,22 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Brak wyników dla &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Brak wyników dla &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Wymagane hasło dla udostępnienia</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Wprowadź hasło dla udostępnienia e-mailem:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Coś Tobie udostępniłem</translation>
</message>
@@ -4448,7 +4478,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nazwa użytkownika</translation>
</message>
@@ -4458,62 +4488,62 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Może edytować</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Może edytować</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Notatka:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Hasło:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Wygasa:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Może udostępnić innym</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Notatka dla odbiorcy</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Ustaw datę wygaśnięcia</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Zatrzymaj udostępnianie</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Może utworzyć</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Może zmienić</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Może usunąć</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Zabezpiecz hasłem</translation>
</message>
@@ -4540,13 +4570,13 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Wybierz nową lokalizację…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Coś Tobie udostępniłem</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opcje udostępniania</translation>
</message>
@@ -4556,79 +4586,100 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Udostępnij przez %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Aktywność</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopiuj link prywatny do schowka</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Wyślij link prywatny e-mailem…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Udostępnianie dalej tego pliku jest niedozwolone</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Udostępnianie dalej tego katalogu jest niedozwolone</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopiuj link publiczny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopiuj link wewnętrzny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Edytuj</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Otwórz w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Rozwiąż konflikt…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Przenieś i zmień nazwę…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Przenieś, zmień nazwę i wyślij…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Usuń zmiany lokalne</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Przenieś i wyślij…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Usuń</translation>
</message>
@@ -5204,29 +5255,29 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Dodaj konto</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Otwórz główne okno dialogowe</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Wstrzymaj synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Wznów synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Ustawienia</translation>
</message>
@@ -5236,22 +5287,22 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Wyjdź z %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Wstrzymaj wszystkie synchronizacje</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Wznów wszystkie synchronizacje</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5259,24 +5310,24 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wersja %1. Aby uzyskać więcej informacji, kliknij &lt;a href=&apos;%2&apos;&gt;tutaj&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Używanie wtyczki plików wirtualnych: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;To wydanie zostało dostarczone przez %1&lt;/p&gt;</translation>
</message>
@@ -5284,22 +5335,22 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Nie udało się pobrać dostawców.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Nie udało się pobrać dostawców wyszukiwania dla &apos;%1&apos;. Błąd: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Wyszukiwanie nie powiodło się dla &apos;%2&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Wyszukiwanie nie powiodło się dla &apos;%1&apos;. Błąd: %2</translation>
</message>
@@ -5307,7 +5358,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Ponów wysłanie wszystkich plików</translation>
</message>
@@ -5340,22 +5391,22 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Potwierdź usunięcie konta</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Usuń połączenie</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
@@ -6017,7 +6068,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Nowy katalog</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Oznacz jako przeczytane</translation>
</message>
@@ -6126,7 +6177,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Nie udało się połączyć z bazą danych.</translation>
</message>
@@ -6147,7 +6198,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Szukaj plików, wiadomości, wydarzeń…</translation>
</message>
@@ -6171,7 +6222,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Wczytaj więcej wyników</translation>
</message>
@@ -6209,7 +6260,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Konto nie jest połączone</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Czynności na koncie</translation>
</message>
@@ -6219,18 +6270,18 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Usuń konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Ustaw status</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Zaloguj</translation>
@@ -6244,52 +6295,52 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Status online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Bezczynny</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Nie przeszkadzać</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Niewidoczny</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Komunikat statusu</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Jaki jest Twój status?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Wyczyść komunikat statusu po</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Wyczyść komunikat statusu</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Ustaw komunikat statusu</translation>
</message>
@@ -6375,12 +6426,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Pobrany plik nie odpowiada sumie kontrolnej, zostanie wznowiony. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Nagłówek sumy kontrolnej zawierał nieznany typ sumy kontrolnej &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Pobrany plik nie odpowiada sumie kontrolnej, zostanie wznowiony. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6388,98 +6439,93 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Główne okno pulpitu Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Bieżące konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Wznów synchronizację dla wszystkich</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Wstrzymaj synchronizację dla wszystkich</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Ustaw status użytkownika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Dodaj konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Dodaj nowe konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Ustawienia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Wyjście</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Aktualny awatar użytkownika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Aktualny status użytkownika to &quot;Online&quot;</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Aktualny status użytkownika to &quot;Nie przeszkadzać&quot;</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Przełączenie konta i menu ustawień</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Otwórz katalog lokalny bieżącego konta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Połączony</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Otwórz Nextcloud Talk w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Więcej aplikacji</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menu aplikacji</translation>
@@ -6500,7 +6546,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Otwórz okno udostępnienia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Więcej aplikacji</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
@@ -6511,7 +6562,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Pokaż więcej akcji</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Ujednolicona lista wyników wyszukiwania</translation>
</message>
@@ -6521,7 +6572,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Udostępnij %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 — Aktywność pliku</translation>
</message>
@@ -6547,7 +6598,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Zbudowany na podstawie wersji Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 przy użyciu Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index ea434de16..568c85d8b 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Abrir %1 localmente</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>Em %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Abrir janela de partilha</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemónica de criptografia ponto-a-ponto</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Para proteger sua Identidade Criptográfica, nós encriptamo-la com uma mnemónica de 12 palavras do dicionário. Por favor anote-as e mantenha-as em segurança. Elas serão necessárias para adicionar outros dispositivos à sua conta (como seu telemóvel ou portátil).</translation>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desligado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Ligado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Serviço indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo de Manutenção</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Perguntar Credenciais</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado de conta desconhecido</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Erro a aceder ao ficheiro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Ocorreu um erro enquanto se acedia ao ficheiro de configuração em %1. Por favor tenha a certeza que o ficheiro pode ser acedido pelo seu utilizador.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Sair do %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1196,8 +1213,8 @@ This action will abort any currently running synchronization.</source>
<translation>A procura do ficheiro de servidor respondeu falta de informação</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1935,12 +1952,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Adicionar Ligação de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Adicionar Ligação de Sincronização</translation>
</message>
@@ -1958,7 +1975,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Insira o caminho para a pasta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecione a pasta de origem</translation>
</message>
@@ -1966,7 +1983,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Criar Pasta Remota</translation>
</message>
@@ -1976,47 +1993,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Insira o nome da nova pasta para ser criada em baixo &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>A pasta foi criada com sucesso em %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>A autenticação falhou ao aceder %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Não foi possível criar a pasta em %1. Por favor, verifique manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Não foi possível listar uma pasta. Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Escolha isto para sincronizar a conta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta pasta já foi sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Já está a sincronizar &lt;i&gt;%1&lt;/i&gt;, que é uma pasta de origem de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2024,24 +2041,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2062,27 +2079,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhum E-Tag recebida do servidor, verifique Proxy / Acesso</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nós recebemos uma E-Tag diferente para retomar. Tentar da próxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>O servidor devolveu o alcance-conteúdo errado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou</translation>
</message>
@@ -2131,83 +2148,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Atualizações</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reiniciar e Atualizar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avançada</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmação antes de sincronizar pastas maiores que</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Pedir confirmação antes de sincronizar armazenamentos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Mostrar pastas de sincronização em &amp;Página de Navegação do Explorador</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar relatório de crache</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar Ficheiros &amp;Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Notificações do Servidor que requerem atenção.</translation>
</message>
@@ -2217,49 +2236,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2613,7 +2632,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Erro</translation>
</message>
@@ -2623,7 +2642,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;O ficheiro &apos;%1&apos;&lt;br/&gt;não pode ser aberto para gravação.&lt;br/&gt;&lt;br/&gt;O ficheiro de registo de saída &lt;b&gt;não&lt;/b&gt; pode ser guardado!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3505,12 +3524,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>tamanho</translation>
</message>
@@ -3525,22 +3544,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>permissão</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3550,47 +3569,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3600,7 +3619,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3641,44 +3660,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>O ficheiro alterou-se desde a sua descoberta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Não foi possível transferir o ficheiro %1 devido a um conflito com o nome de ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>A transferência iria reduzir o espaço livre local acima do limite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>O Espaço livre no disco é inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>O ficheiro foi eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Não foi possível transferir o ficheiro na totalidade.</translation>
</message>
@@ -3688,12 +3707,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
</message>
@@ -3703,18 +3722,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Erro ao gravar os metadados para a base de dados</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4101,7 +4120,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Rejeitar</translation>
</message>
@@ -4148,32 +4167,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Caminho OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ícone</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>partilhar etiqueta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Caminho do Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Pasta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Partilhando</translation>
</message>
@@ -4183,17 +4213,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>O ficheiro não pode ser partilhado porque foi partilhado sem permissão de partilha.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4206,7 +4236,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Palavra-passe:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Partilhar ligação</translation>
</message>
@@ -4216,7 +4246,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4231,7 +4261,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Defina a senha</translation>
</message>
@@ -4241,7 +4271,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Expira:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4336,27 +4366,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Apagar hiperligação de partilha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar Eliminação do Link de Partilha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Hiperligação Pública</translation>
</message>
@@ -4364,7 +4394,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4374,7 +4404,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copiar ligação</translation>
</message>
@@ -4384,22 +4414,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Sem resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Partilhei alguma coisa consigo</translation>
</message>
@@ -4407,7 +4437,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4417,62 +4447,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>pode editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Pode voltar a partilhar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Cancelar partilha</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Pode criar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Pode alterar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Pode apagar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4499,13 +4529,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Partilhei alguma coisa consigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opções de partilha</translation>
</message>
@@ -4515,79 +4545,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Partilhar via %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar link privado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Voltar a partilhar não é permitido</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiar link publico</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copiar ligação interna</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Editar</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
@@ -5163,29 +5214,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Adicionar conta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configurações</translation>
</message>
@@ -5195,22 +5246,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5218,24 +5269,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versão %1. Para mais informação por favor clique &lt;a href=&apos;%2&apos;&gt;aqui&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Esta versão foi fornecida por %1&lt;/p&gt;</translation>
</message>
@@ -5243,22 +5294,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5266,7 +5317,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5299,22 +5350,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -5976,7 +6027,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6085,7 +6136,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6106,7 +6157,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6130,7 +6181,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6168,7 +6219,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6178,18 +6229,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Terminar sessão</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Iniciar sessão</translation>
@@ -6203,52 +6254,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6334,12 +6385,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6347,98 +6398,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Conta atual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Adicionar conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configurações</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Ligado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desligado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Mais apps</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6459,7 +6505,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Mais apps</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
@@ -6470,7 +6521,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6480,7 +6531,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6506,7 +6557,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Construido a partir da revisão Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; em %3, %4 usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 5d1712ecd..8c9b459b2 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Abrir %1 localmente</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>Em %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Abrir caixa de diálogo compartilhada</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemônico da criptografia de ponta-a-ponta</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Para proteger sua Identidade Criptográfica, nós criptografamos com um mnemônico de 12 palavras de dicionário. Anote e mantenha-os em segurança. Eles serão necessários para adicionar outros dispositivos à sua conta (como seu celular ou laptop).</translation>
</message>
@@ -734,47 +752,47 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Serviço indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modo de manutenção</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Solicitando credenciais</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Estado desconhecido da conta</translation>
</message>
@@ -782,17 +800,17 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Para mais atividades, abra o aplicativo Atividade.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Arquivos da lista de ignorados e links simbólicos não são sincronizados.</translation>
</message>
@@ -853,42 +871,42 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Continuar significa &lt;b&gt;excluir essas configuracões&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Continuar significa &lt;b&gt;ignorar essas configuraçães&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Algumas configurações foram definidas em versões mais recentes deste cliente e usam recursos que não estão disponíveis nesta versão. &lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;O arquivo de configuração atual já foi copiado para &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Erro acessando o arquivo de configuração</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Houve um erro ao acessar o arquivo de configuração em % 1. Certifique-se que o arquivo pode ser acessado pelo seu usuário.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
@@ -930,7 +948,6 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>O arquivo %1 possui data/hora de modificação inválida. Não enviar ao servidor.</translation>
</message>
@@ -1203,8 +1220,8 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<translation>Na resposta de descoberta do arquivo do servidor está faltando dados.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Erro do servidor: a resposta PROPFIND não está formatada em XML! </translation>
</message>
@@ -1958,12 +1975,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Adicionar conexão de sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Adicionar conexão de sincronização</translation>
</message>
@@ -1981,7 +1998,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Informe o caminho da pasta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selecionar a pasta de origem</translation>
</message>
@@ -1989,7 +2006,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Criar uma Pasta Remota</translation>
</message>
@@ -1999,47 +2016,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Insira o nome da nova pasta a ser criada abaixo de &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Digite o nome da nova pasta a ser criada abaixo de &quot;%1&quot;: </translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Pasta foi criada com sucesso em %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Falha na autenticação acessando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Falha ao listar uma pasta. Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Escolha esta opção para sincronizar a conta inteira</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Esta pasta já está sendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Você já está sincronizando &lt;i&gt;%1&lt;/i&gt;, que é a pasta pai de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Você já está sincronizando &lt;i&gt;%1&lt;/i&gt;, que é uma subpasta de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2047,24 +2064,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Use arquivos virtuais em vez de baixar o conteúdo imediatamente %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Arquivos virtuais não são suportados como partição raiz do Windows como pasta local. Escolha uma subpasta válida na letra da unidade. </translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Os arquivos virtuais não estão disponíveis para a pasta selecionada </translation>
</message>
@@ -2085,27 +2102,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique o Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para retomar. Retentando na próxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Recebemos inesperado arquivo com Comprimento-Inesperado. </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>O servidor retornou um conteúdo errado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Tempo Limite de Conexão Atingido</translation>
</message>
@@ -2154,83 +2171,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Atualizações</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Checar &amp;Atualizações automaticamente </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Canal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>estável</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Reiniciar &amp;&amp; Atualizar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Checar por Atualização agora</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avançado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedir confirmação antes de sincronizar pastas maiores que</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Pedir confirmação antes de sincronizar armazenamentos externos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Exibir pastas de sincronização no Painel de Navegação do &amp;Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>M&amp;ostrar relatório de acidentes</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editar arquivos a &amp;ignorar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Criar arquivo de depuração...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Notificações do servidor que exigem atenção.</translation>
</message>
@@ -2240,17 +2259,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Você não pode desativar a inicialização automática porque a inicialização automática em todo o sistema está ativada. </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Mudar canal de atualização?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2259,32 +2278,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Observe que isso seleciona apenas quais upgrades de pool são retirados, e que não há downgrades: Portanto, voltar do canal beta para o canal estável geralmente não pode ser feito imediatamente e significa esperar por uma versão estável que seja mais recente que a beta instalada atualmente versão.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Mudar canal de atualização</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Criar arquivamento de depuração</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Arquivos Zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Depurar arquivamento criado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Arquivo de depuração é criado às %1</translation>
</message>
@@ -2644,7 +2663,7 @@ Logs serão gravados em %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Erro</translation>
</message>
@@ -2654,7 +2673,7 @@ Logs serão gravados em %1</translation>
<translation>&lt;nobr&gt;Arquivo &apos;%1&apos;&lt;br/&gt;não pode ser aberto para escrita.&lt;br/&gt;&lt;br/&gt;A saída de log &lt;b&gt;não&lt;/b&gt; pode ser salva!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;O arquivo &quot;%1&quot;&lt;br/&gt;não pode ser aberto para escrita .&lt;br/&gt;&lt;br/&gt;A saída do log &lt;b&gt;não pode&lt;/b&gt; ser salva!&lt;/nobr&gt;</translation>
</message>
@@ -3544,12 +3563,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>O nome do arquivo está na lista negra do servidor. </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>O arquivo tem extensão reservada para arquivos virtuais. </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>tamanho</translation>
</message>
@@ -3564,22 +3583,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>servidor relatou não %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>permissão</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>ID do arquivo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Servidor relatou não %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Não é possível sincronizar devido ao horário de modificação inválido</translation>
</message>
@@ -3589,47 +3608,47 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Conflito ao enviar alguns arquivos para uma pasta. Esses, em conflito, serão eliminados! </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Conflito ao enviar uma pasta. Vai ser limpa! </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Conflito ao enviar um arquivo. Vai ser removido! </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado devido à lista negra &quot;escolher o que sincronizar&quot; </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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 a essa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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 nessa pasta </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer upload deste arquivo porque ele é somente leitura no servidor, restaurando </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido para destino inválido, restaurando </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Não tem permissão para remover, restaurar </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Erro ao ler o banco de dados </translation>
</message>
@@ -3639,7 +3658,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>O servidor respondeu com um erro ao ler o diretório &apos;%1&apos; : %2 </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>O servidor respondeu com um erro ao ler o diretório &quot;%1&quot; : %2</translation>
</message>
@@ -3680,44 +3699,44 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>O arquivo %1 não pode ser baixado porque a informação de criptografia está faltando.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>O arquivo %1 não pode ser baixado porque está faltando informações de criptografia.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>O arquivo foi alterado desde a descoberta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser baixado devido a um conflito local no nome do arquivo!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser baixado devido a um conflito local no nome do arquivo!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>O download reduziria o espaço livre no disco local abaixo do limite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>O espaço livre no disco é inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>O arquivo foi apagado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>O arquivo não pôde ser baixado completamente.</translation>
</message>
@@ -3727,12 +3746,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>O arquivo baixado está vazio apesar do servidor ter anunciado que ele deveria ter %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>O arquivo baixado está vazio, mas o servidor disse que deveria ser %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>O arquivo %1 não pôde ser salvo devido a um conflito com um nome de arquivo local!</translation>
</message>
@@ -3742,18 +3761,18 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Ocorreu um erro ao escrever metadados no banco de dados</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>O arquivo %1 possui erro na data/hora modificada informado pelo servidor. Não salvar.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 está correntemente em uso</translation>
</message>
@@ -4140,7 +4159,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Responder</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
@@ -4187,32 +4206,43 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Caminho do ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ícone</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>compartilhar rótulo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Caminho Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Pasta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Compartilhamento %1</translation>
</message>
@@ -4222,17 +4252,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>O arquivo não pode ser compartilhado, pois o foi sem permissão de compartilhamento.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>O arquivo não pode ser compartilhado porque não tem permissão de compartilhamento.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Digite uma senha para seu link de compartilhamento:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>É necessária uma senha de compartilhamento</translation>
</message>
@@ -4245,7 +4275,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Senha:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Compartilhar link</translation>
</message>
@@ -4255,7 +4285,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Observação:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Nota</translation>
</message>
@@ -4270,7 +4300,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Data de expiração:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Definir senha</translation>
</message>
@@ -4280,7 +4310,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Vencimento:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Expira</translation>
</message>
@@ -4375,27 +4405,27 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Excluir o link de compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Confirmar o Link de Eliminação de Compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Quer mesmo excluir o link de compartilhamento público &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Nota: Esta ação não pode ser desfeita.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Excluir</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Link público</translation>
</message>
@@ -4403,7 +4433,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Compartilhar com usuários ou grupos...</translation>
</message>
@@ -4413,7 +4443,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Pesquisar globalmente</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copiar link</translation>
</message>
@@ -4423,22 +4453,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Sem resultados para &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Nenhum resultado para &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>É necessária uma senha de compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Digite uma senha para seu compartilhamento por e-mail:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Eu compartilhei algo com você</translation>
</message>
@@ -4446,7 +4476,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nome de Usuário</translation>
</message>
@@ -4456,62 +4486,62 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>pode editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Pode editar</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Senha:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Expira em:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Pode recompartilhar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Nota para o destinatário</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Definir data de validade </translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Descompartilhar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Pode criar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Pode alterar</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Pode excluir</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Proteger com senha</translation>
</message>
@@ -4538,13 +4568,13 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Selecionar novo local...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Eu compartilhei algo com você</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Opções de compartilhamento</translation>
</message>
@@ -4554,79 +4584,100 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Compartilhar via %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Copiar link privado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Enviar link privado por e-mail...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Não é permitido recompartilhar este arquivo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Compartilhar de novo esta pasta não é permitido </translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiar link público</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copiar link interno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Editar</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Resolver conflito…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Mover e renomear...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Mova, renomeie e faça upload...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Excluir alterações locais</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Mover e fazer upload...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Excluir</translation>
</message>
@@ -5202,29 +5253,29 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Adicionar conta</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Abrir a caixa de diálogo principal</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Continuar a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Configurações</translation>
</message>
@@ -5234,22 +5285,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Sair do %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pausar a sincronização para todos</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Continuar a sincronização para todos</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5257,24 +5308,24 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Cliente Desktop&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versão %1. Para mais informações clique &lt;a href=&apos;%2&apos;&gt;aqui&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Usando o plugin de arquivos virtuais: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Esta versão foi fornecida por %1&lt;/p&gt;</translation>
</message>
@@ -5282,22 +5333,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Falha ao buscar provedores. </translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Falha ao buscar provedores de pesquisa para &apos;%1&apos;. Erro: %2 </translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>A pesquisa por &apos;%2&apos; falhou.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>A pesquisa por &apos;%1&apos; falhou. Erro: %2 </translation>
</message>
@@ -5305,7 +5356,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Retentar todos os envios</translation>
</message>
@@ -5338,22 +5389,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Confirme a Exclusão da Conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Quer realmente excluir a conexão para a conta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Obs.:&lt;/b&gt; Isso &lt;b&gt;não&lt;/b&gt; excluirá nenhum arquivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Excluir conexão</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -6015,7 +6066,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Nova pasta </translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Marcar como Lido</translation>
</message>
@@ -6124,7 +6175,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Falha ao conectar banco de dados</translation>
</message>
@@ -6145,7 +6196,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Pesquise arquivos, mensagens, eventos ... </translation>
</message>
@@ -6169,7 +6220,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Carregar mais resultados </translation>
</message>
@@ -6207,7 +6258,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Conta não conectada</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Ações da conta</translation>
</message>
@@ -6217,18 +6268,18 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Remover conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Definir status</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Entrar</translation>
@@ -6242,52 +6293,52 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Status online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Longe</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Não perturbe</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Invisível</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Mensagem de status</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Qual é o seu status?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Limpar mensagem de status após</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Limpar mensagem de status</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Definir mensagem de status</translation>
</message>
@@ -6373,12 +6424,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>O arquivo baixado não corresponde à soma de verificação, ele será retomado. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>O cabeçalho da soma de verificação continha um tipo de soma de verificação desconhecido &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>O arquivo baixado não corresponde à soma de verificação, ele será retomado. &quot;%1&quot;! = &quot;%2&quot; </translation>
</message>
@@ -6386,98 +6437,93 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Diálogo principal do Nextcloud Desktop</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Conta atual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Retomar a sincronização para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pausar a sincronização para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Definir o status do usuário</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Adicionar conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Adicionar nova conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Configurações</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar do usuário atual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Online é o status atual do usuário</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Não Perturbe é o status atual do usuário</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Alternador de conta e menu de configurações</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Abrir pasta local da conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Abrir o Nextcloud Talk no navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Mais aplicativos</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menu de aplicativos</translation>
@@ -6498,7 +6544,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Abrir janela de compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Mais aplicativos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
@@ -6509,7 +6560,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Mostrar mais ações</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Lista unificada de resultados de pesquisa </translation>
</message>
@@ -6519,7 +6570,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Compartilhar %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Atividade de arquivo</translation>
</message>
@@ -6545,7 +6596,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Construído da revisão Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; em %3, %4 usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_ro.ts b/translations/client_ro.ts
index 4826bbf56..16818c9e6 100644
--- a/translations/client_ro.ts
+++ b/translations/client_ro.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Deschis %1 local</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Fraza de memorare pentru criptarea end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Pentru a proteja identitatea ta criptografică noi o criptăm cu o frază de memorare ce conține 12 cuvinte provenite din dictionar (în engleză). Vă rugăm să notați aceste cuvinte și să letineți într-un loc sigur. Acestea vor fi necesare pentru a adăuga alte dispozitive la contul dumneavoastră (de exemplu telefonul mobil sau laptopul).</translation>
</message>
@@ -734,47 +752,47 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Deconectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Deconenctat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Conectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Serviciu indisponibil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Mod mentenanță</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Eroare de rețea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Eroare de configurare</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Întrebare despre acreditări</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Nu se cunoaște starea contului</translation>
</message>
@@ -782,17 +800,17 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Pentru mai multe activități vă rugăm deschideți aplicația de activități.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Fișierele din lista de ignorare precum și legăturile simbolice nu sunt sincronizate.</translation>
</message>
@@ -853,42 +871,42 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Dacă continuați aceste setări &lt;b&gt;vor fi șterse&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Dacă continuați aceste setări &lt;b&gt;vor fi ignorate&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Unele setări au fost configurate în versiuni mai noi ale acetui client folosind niște opțiuni ce nu sunt disponibile în această versiune. &lt;br&gt;&lt;br&gt; %1&lt;br&gt;&lt;br&gt;Fișierul de configurare a fost deja copiat la &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Ieșire</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Continuare</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>A apărut o eroare în accesarea fișierului de ocnfigurare</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>A apărut o eroare în accesarea fișierului de configurare la %1. Vă rugăm să vă asigurați că fișierul poate fi accesat de către acest utilizator.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Ieșire %1</translation>
</message>
@@ -930,7 +948,6 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1203,8 +1220,8 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
<translation>Răspunsul serverului are date lipsă</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Eroare de server: PROPFIND reply is not XML formatted!</translation>
</message>
@@ -1949,12 +1966,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Adaugă conexiunea de sincronizare pentru dosar</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Aadaugă conexiune de sincronizare</translation>
</message>
@@ -1972,7 +1989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Introduceți calea către dosarul local.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Selectează directorul sursă</translation>
</message>
@@ -1980,7 +1997,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Creează directorul destinație</translation>
</message>
@@ -1990,47 +2007,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Introduceți numele noului dosar ce va fii creat mai joi &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Introduceți numele noului dosar ce va fii creat mai joi &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Dosarul a fost creeat cu succes pe %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autentificarea a eșuat în momentul accesării %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Nu se poate creea un dosar pe %1. Vă rugăm să verificați manual.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>A apărut o eroare in timpul listării dosarului. Eroare: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Apasă aici pentru a sincroniza tot contul</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Acest dosar este deja sincronizat</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Deja sincronizezi &lt;i&gt;%1&lt;/i&gt;, care este un dosar păritnte pentru &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Deja sincronizezi &lt;i&gt;%1&lt;/i&gt;,. care este un subdosar al &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2038,24 +2055,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Folosește fișiere virtuale în loc să descarci continutul imediat %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Fișierele virtuale nu sunt suportate pentru partițiile Wwindows ca dosar local. Vă rugăm să alegeți un subdosar valid. </translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Fișierele virtuale nu sunt disponibile pentru dosarul selectat</translation>
</message>
@@ -2076,27 +2093,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nu s-a primit nici-un E-Tag de la server, verifică setările pentru Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Am primit un E-Tag diferit pentru a relua activitatea. Se reîncearcă data viitoare.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Eroare de conexiune</translation>
</message>
@@ -2145,83 +2162,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Actualizări</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Canal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avansat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2231,49 +2250,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Anulează</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Arhive Zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2625,7 +2644,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Eroare</translation>
</message>
@@ -2635,7 +2654,7 @@ Logs will be written to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3516,12 +3535,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3536,22 +3555,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3561,47 +3580,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3611,7 +3630,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3652,44 +3671,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
@@ -3699,12 +3718,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -3714,18 +3733,18 @@ 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/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4112,7 +4131,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Înlătură</translation>
</message>
@@ -4159,32 +4178,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Pictogramă</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>partajază eticheta</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Director: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
@@ -4194,17 +4224,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Fișierul nu poate fi partajat întrucât a fost partajat fără permisiuni de partajare.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4217,7 +4247,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Parola:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4227,7 +4257,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4242,7 +4272,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Data expirării:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
@@ -4252,7 +4282,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4347,27 +4377,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Șterge linkul partajat</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Șterge</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Anulează</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Link public</translation>
</message>
@@ -4375,7 +4405,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4385,7 +4415,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Copiză link</translation>
</message>
@@ -4395,22 +4425,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Niciun rezultat pentru &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Am partajat ceva cu tine</translation>
</message>
@@ -4418,7 +4448,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4428,62 +4458,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>poate edita</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Poate repartaja</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Anulare partajare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Poate crea</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Poate schimba</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Poate șterge</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4510,13 +4540,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Am partajat ceva cu tine</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4526,79 +4556,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Copiză link public</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Copiază linkul intern</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Deschide în Browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Șterge</translation>
</message>
@@ -5172,29 +5223,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Adaugă cont</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Setări</translation>
</message>
@@ -5204,22 +5255,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5227,24 +5278,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5252,22 +5303,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5275,7 +5326,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5308,22 +5359,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5985,7 +6036,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6094,7 +6145,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6115,7 +6166,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6139,7 +6190,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6177,7 +6228,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6187,18 +6238,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Ieșire</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Autentificare</translation>
@@ -6212,52 +6263,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6343,12 +6394,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6356,98 +6407,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Cont actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Adaugă cont</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Setări</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Conectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Deconenctat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Mai multe aplicatii</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6468,7 +6514,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Mai multe aplicatii</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Deschide %1 în Browser</translation>
</message>
@@ -6479,7 +6530,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6489,7 +6540,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6515,7 +6566,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index f303bea28..fe1c4b61d 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Открыть «%1» на ПК</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>В %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Отказать</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Открыть диалоговое окно общего доступа</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Мнемофраза сквозного шифрования</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Для защиты личного идентификатора сквозного шифрования используется мнемофраза, состоящая из двенадцати слов. Мнемофразу следует записать и сохранить запись в надёжном месте, она потребуется для подключения к учётной записи ваших дополнительных устройств.</translation>
</message>
@@ -733,47 +751,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Выполнен выход из учётной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Отключено</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Подключено</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Сервис недоступен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Режим технического обслуживания.</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Ошибка сети</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Ошибка конфигурации</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Запрос учётных данных</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Неизвестное состояние учетной записи</translation>
</message>
@@ -781,17 +799,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Вся история доступна в приложении «События».</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Из синхронизации исключены символьные ссылки и файлы, попадающие под правила из списка игнорируемых файлов.</translation>
</message>
@@ -852,42 +870,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>При продолжении, эти &lt;b&gt;параметры будут удалены&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>При продолжении, эти &lt;b&gt;параметры будут проигнорированы&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Используемая версия приложения не поддерживает некоторые параметры, настроенные в более новой версии. &lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; Резервная копия файла конфигурации сохранена в &lt;i&gt;%2&lt;/i&gt;. </translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Ошибка при доступе к файлу конфигурации</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Ошибка при обращении к файлу конфигурации «%1», убедитесь, что файл доступен.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Выйти из %1</translation>
</message>
@@ -929,7 +947,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Файл %1 имеет недопустимое время изменения. Не загружайте его на сервер.</translation>
</message>
@@ -1202,8 +1219,8 @@ This action will abort any currently running synchronization.</source>
<translation>Сервер вернул ответ, не содержащих данных о файле.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Ошибка сервера: ответ PROPFIND не в формате XML.</translation>
</message>
@@ -1956,12 +1973,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Добавление подключения синхронизации папки</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Добавить подключение для синхронизации</translation>
</message>
@@ -1979,7 +1996,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Укажите путь к локальному каталогу.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Выберите папку-источник</translation>
</message>
@@ -1987,7 +2004,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Создать папку на сервере</translation>
</message>
@@ -1997,47 +2014,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Введите имя папки для создания внутри «%1»:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Введите имя папки для создания внутри «%1»:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Каталог успешно создан на %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Ошибка авторизации при доступе к %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Невозможно создать каталог по пути %1. Попробуйте создать его вручную.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Ошибка просмотра папки. Ошибка: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Нажмите здесь для синхронизации всей учётной записи</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Синхронизация этой папки уже настроена.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Каталог &lt;i&gt;«%1»&lt;/i&gt; уже настроен для синхронизации, и он является родительским для каталога &lt;i&gt;«%2»&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Папка &lt;i&gt;«%1»&lt;/i&gt; уже настроена для синхронизации, и она является вложенной для папки &lt;i&gt;«%2»&lt;/i&gt;.</translation>
</message>
@@ -2045,24 +2062,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Использовать виртуальные файлы вместо загрузки %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(экспериментальная функция)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>В ОС Windows механизм виртуальных файлов не поддерживается для корневой уровня файловой системы. Для продолжения выберите папку на диске, а не сам диск.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Использование виртуальные файлов недоступно для выбранной папки</translation>
</message>
@@ -2083,27 +2100,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>E-Tag от сервера не получен, проверьте настройки прокси/шлюза.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Получена отличающаяся метка возобновления, будет произведена ещё одна попытка.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Получено неожиданное значение размера данных.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Сервер вернул неверный диапазон содержимого</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Время ожидания подключения истекло</translation>
</message>
@@ -2152,83 +2169,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Обновления</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>Проверять наличие о&amp;бновлений</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Канал</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>стабильный</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>бета</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Перезапуск и обновление</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Проверить наличие обновлений</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Дополнительно</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Запрашивать подтверждение синхронизации папок размером более</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>МБ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Запрашивать подтверждение синхронизации внешних хранилищ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Показывать синхронизируемые папки в панели навигации &amp;Проводника</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Показать отчёты об ошибках</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Список исключений синхронизации…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Создать архив с отладочными данными…</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Требующие внимания уведомления, полученные с сервера.</translation>
</message>
@@ -2238,17 +2257,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Автоматический запуск не может быть отключен, т.к. он настроен на уровне системы.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Сменить канал обновлений?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2257,32 +2276,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Обратите внимание, что смена канала возможна переход только при увеличения внутренней версии приложения: переход со стабильного на бета-канал происходит моментально, а переход с бета-канала на стабильный потребует времени, пока стабильная версия станет новее установленной бета-версии.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Сменить канал обновлений</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Создать архив с отладочными данными</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip архивы</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Создан архив с отладочными данными</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Архив с отладочными данными создан: «%1»</translation>
</message>
@@ -2642,7 +2661,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
@@ -2652,7 +2671,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Файл &apos;%1&apos;&lt;br/&gt;не может быть открыт на запись.&lt;br/&gt;&lt;br/&gt;Журнал &lt;b&gt;не может&lt;/b&gt; быть сохранён!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Файл «%1»&lt;br/&gt;не может быть открыт на запись.&lt;br/&gt;&lt;br/&gt;Журнал &lt;b&gt;не может&lt;/b&gt; быть сохранён!&lt;/nobr&gt;</translation>
</message>
@@ -3541,12 +3560,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Имя файла внесено в чёрный список на сервере.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Расширение файла является зарезервированным для виртуальных файлов.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>размер</translation>
</message>
@@ -3561,22 +3580,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ответ сервера: %1 отсуствует</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>разрешение</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>id файла</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Сервер сообщил об отсутствии %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3586,47 +3605,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Передача файлов в папку на сервере привела к конфликту версий. Файлы, вызвавшие конфликт версий, будут удалены.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Передача папки на сервер привела к конфликту версии. Папка, вызвавшая конфликт версии, будет удалена.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Передача файла на сервер привела к конфликту версии. Файл, вызвавший конфликт версии, будет удалён.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Игнорируется из-за совпадения с записью в списке исключений из синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Перемещено в некорректное расположение, выполняется восстановление</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Удаление недопустимо, выполняется восстановление</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Ошибка чтения базы данных</translation>
</message>
@@ -3636,7 +3655,7 @@ 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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Ошибка сервера при попытке прочитать каталог «%1»: %2</translation>
</message>
@@ -3677,44 +3696,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Файл «%1» не может быть загружен из-за отсутствия информации о применяемом шифровании.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Файл %1 не может быть загружен из-за отсутствия информации о применяемом шифровании.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>После обнаружения файл был изменен</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Файл %1 не может быть загружен из-за локального конфликта имён.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Файл «%1» не может быть загружен из-за локального конфликта имён.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Загрузка файлов с сервера уменьшит доступное пространство на локальном диске ниже допустимого предела</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Свободного места на диске меньше чем %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Файл удалён с сервера</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Невозможно полностью загрузить файл.</translation>
</message>
@@ -3724,12 +3743,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Скачанный файл пуст, хотя сервер сообщил, что его размер должен составлять %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Скачанный файл пуст, хотя сервер сообщил, что его размер должен составлять %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл «%1» не может быть сохранён по причине локального конфликта имён.</translation>
</message>
@@ -3739,18 +3758,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Файл %1 имеет неверное время изменения, сообщенное сервером. Не сохраняйте его.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Ошибка обновления метаданных: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Файл «%1» используется</translation>
</message>
@@ -4137,7 +4156,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Отклонить</translation>
</message>
@@ -4184,32 +4203,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Путь ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Значок</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>поделиться меткой</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Расположение Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Папка: «%2»</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 — Предоставление общего доступа</translation>
</message>
@@ -4219,17 +4249,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>К файлу нельзя предоставить общий доступ, поскольку у него нет разрешения на совместное использование.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Задайте пароль для доступа по ссылке:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Требуется задать пароль для общего ресурса</translation>
</message>
@@ -4242,7 +4272,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Пароль:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Предоставление общего доступа по ссылке</translation>
</message>
@@ -4252,7 +4282,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Примечание:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Примечание</translation>
</message>
@@ -4267,7 +4297,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Срок действия:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Установить пароль</translation>
</message>
@@ -4277,7 +4307,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Истекает:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Срок действия</translation>
</message>
@@ -4372,27 +4402,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Удалить ссылку</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Подтверждение закрытия доступа по ссылке</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Действительно закрыть доступ по ссылке «&lt;i&gt;%1&lt;/i&gt;»?&lt;/p&gt;&lt;p&gt;Внимание: это действие будет невозможно отменить.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Общедоступная ссылка</translation>
</message>
@@ -4400,7 +4430,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Поделиться с пользователями или группами…</translation>
</message>
@@ -4410,7 +4440,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Искать глобально</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Скопировать ссылку</translation>
</message>
@@ -4420,22 +4450,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Отсутствуют результаты поиска «%1»</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Отсутствуют результаты поиска «%1»</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Создаваемый общий ресурс требуется защитить паролем</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Задайте пароль для публикации ссылки по эл. почты:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Вам предоставлен доступ</translation>
</message>
@@ -4443,7 +4473,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Имя пользователя</translation>
</message>
@@ -4453,62 +4483,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>разрешить редактировать</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Разрешить редактировать</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Примечание:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Пароль:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Истекает:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>разрешить делиться</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Примечание для получателя</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Установить срок действия</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Закрыть доступ</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>разрешить создавать</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>разрешить вносить изменения</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>разрешить удалять</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Защитить паролем</translation>
</message>
@@ -4535,13 +4565,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Выбрать новое расположение ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Я поделился с тобой</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Общий доступ…</translation>
</message>
@@ -4551,79 +4581,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 — Предоставление общего доступа </translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Активность</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Скопировать закрытую ссылку в буфер обмена</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Отправить закрытую ссылку по электронной почте...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Повторная публикация этого файла не разрешена</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Повторная публикация этой папки не разрешена</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Скопировать общедоступную ссылку</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Скопировать внутреннюю ссылку</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Редактировать</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Открыть в браузере</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Разрешение конфликта …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Переместить и переименовать …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Переместить, переименовать и загрузить …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Удалить локальные изменения</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Переместить и загрузить …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Удалить</translation>
</message>
@@ -5199,29 +5250,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Добавить аккаунт</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Открыть основное окно</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Возобновить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Параметры</translation>
</message>
@@ -5231,22 +5282,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Закрыть %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Приостановить синхронизацию всех учётных записей</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Возобновить синхронизацию всех учётных записей</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5254,24 +5305,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 клиент для ПК&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Версия %1. Для получения дополнительной информации нажмите &lt;a href=&apos;%2&apos;&gt;сюда&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Используемый модуль поддержки виртуальных файлов: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Этот выпуск подготовлен %1&lt;/p&gt;</translation>
</message>
@@ -5279,22 +5330,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Не удалось получить поставщиков.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Не удалось получить список поставщиков поиска %1: Ошибка: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Ошибка поиска %2.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Ошибка поиска %1: Ошибка %2</translation>
</message>
@@ -5302,7 +5353,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Повторить передачу файлов на сервер</translation>
</message>
@@ -5335,22 +5386,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Подтверждение удаления учётной записи</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Удалить подключение</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -6012,7 +6063,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Новая папка</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Отметить как прочитанное</translation>
</message>
@@ -6121,7 +6172,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Не удалось подключиться к базе данных</translation>
</message>
@@ -6142,7 +6193,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Искать файлы, сообщения, события…</translation>
</message>
@@ -6166,7 +6217,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Показать больше результатов</translation>
</message>
@@ -6204,7 +6255,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Учётная запись не подключена</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Действия над аккаунтом</translation>
</message>
@@ -6214,18 +6265,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Удалить учётную запись</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Установить статус</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Войти</translation>
@@ -6239,52 +6290,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Статус работы в сети</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>В сети</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Отошёл</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Не беспокоить</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Невидимый</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Описание статуса</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Опишите свой статус</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Убрать описание статуса через</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Убрать описание статуса</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Описать статус</translation>
</message>
@@ -6370,12 +6421,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Вычисленная контрольная сумма файла не соответствует ожидаемой, операция будет возобновлена: «%1»&lt;&gt;«%2»</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Заголовок контрольной суммы содержит контрольную сумму неизвестного типа: «%1»</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Вычисленная контрольная сумма файла не соответствует ожидаемой, операция будет возобновлена: %1 != %2</translation>
</message>
@@ -6383,98 +6434,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Основное окно Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Текущая учётная запись</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Возобновить синхронизацию всех учётных записей</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Приостановить синхронизацию всех учётных записей</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Задать статус</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Добавить аккаунт</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Добавить учётную запись</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Параметры</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Выход</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Текущее изображение профиля</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Текущий статус пользователя - в сети</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Текущий статус пользователя - не беспокоить</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Переключение уч. записей и настройки</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Открыть локальную папку текущей учетной записи</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Подключено</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Отключено</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Открыть Nextcloud Talk в браузере</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Ещё приложения</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Меню приложений</translation>
@@ -6495,7 +6541,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Открыть диалог настройки общего доступа</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Ещё приложения</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
@@ -6506,7 +6557,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Дополнительные действия</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Единый список результатов поиска</translation>
</message>
@@ -6516,7 +6567,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Опубликовать «%1»</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Файловая активность</translation>
</message>
@@ -6542,7 +6593,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Собрано из исходников Git версии &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; на %3, %4 с использованием библиотек Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_sc.ts b/translations/client_sc.ts
index fddf22908..c0bf3c163 100644
--- a/translations/client_sc.ts
+++ b/translations/client_sc.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Aberi %1 in locale</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Tzifradura mnemònica End to end</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Pro bardiare s&apos;identidade criptogràfica tua, dda tziframus con unu còdighe mnemònicu de 12 paràulas de ditzionàriu. Signa·ti·ddas e pone·ddas a banda. Ant a serbire pro agiùnghere àteros dispositivos a su tuo (che a su telefoneddu o a su portàtile).</translation>
</message>
@@ -734,47 +752,47 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Essidu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Disconnètidu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Connètidu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Servìtziu no a disponimentu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Modalidade mantenidura</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Errore de rete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Ddoe at àpidu un&apos;errore de cunfiguratzione</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Rechesta credentziales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Istadu de su contu disconnotu</translation>
</message>
@@ -782,17 +800,17 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Pro àteras atividades, pro praghere, aberi s&apos;aplicatzione Activity. </translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Is archìvios de s&apos;elencu de non tènnere in contu gasi comente is ligòngios non sunt sincronizados.</translation>
</message>
@@ -853,42 +871,42 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>A sighire bolet nàrrere a &lt;b&gt;nche cantzellare custas impostatziones&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>A sighire bolet nàrrere a &lt;b&gt;a non tènnere in contu custas impostatziones&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Calicuna impostatzione est istada cunfigurada in is versiones prus noas de custu cliente e impreat funtzionalidades chi non sunt a disponimentu in custa versione.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;S&apos;archìviu de cunfiguratzione atuale est istadu giai postu in una còpia de seguridade in &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Essi·nche</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Sighi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Ddoe at àpidu un&apos;errore intrende a s&apos;archìviu de cunfiguratzione</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Ddoe at àpidu un&apos;errore intrende a s&apos;archìviu de cunfiguratzione su %1. Segura·ti chi a s&apos;archìviu si potzat intrare dae s&apos;utèntzia tua.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Essi·nche %1</translation>
</message>
@@ -930,7 +948,6 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1203,8 +1220,8 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
<translation>Sa risposta de su rilevamentu de s&apos;archìviu de su serbidore at rispostu chi mancant datos.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Errore de su serbidore: sa risposta PROPFIND no est in formadu XML!</translation>
</message>
@@ -1961,12 +1978,12 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Agiunghe connessione de sincronizatzione cartellas</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Agiunghe connessione de sincronizatzione</translation>
</message>
@@ -1984,7 +2001,7 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<translation>Iscrìe su caminu a sa cartella locale.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Seletziona sa cartella sorgente</translation>
</message>
@@ -1992,7 +2009,7 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Crea cartella remota</translation>
</message>
@@ -2002,47 +2019,47 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<translation>Iscrie su nùmene de sa cartella noa de creare suta de su&apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Iscrie su nùmene de sa cartella noa de creare suta de su &quot;%1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Sa cartella creada in manera curreta in %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autenticatzione faddida intrende a %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>No at fatu a creare sa cartella in %1. Pro praghere, controlla tue etotu.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>No at fatu a pònnere in elencu una cartella. Errore: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Seletziona·dda pro sincronizare totu su contu</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Custa cartella nch&apos;est giai sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ses giai sincronizende &lt;i&gt;%1&lt;/i&gt;, cun sa cartella superiore de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ses giai sincronizende &lt;i&gt;%1&lt;/i&gt;, cun una cartella inferiore de&lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2050,24 +2067,24 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Imprea archìvios virtuales imbetzes de iscarrigare deretu su cuntenutu %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(isperimentale)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Is archìvios virtuales no sunt suportados pro is sorgentes de partzidura de Windows comente cartellas locales. Sèbera una sutacartella bàlida a suta de sa lìtera de su discu.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Imprea archìvios virtuales imbetzes de iscarrigare deretu is cuntenutos</translation>
</message>
@@ -2088,27 +2105,27 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Peruna etichetta eletrònica retzida dae su serbidore, controlla su proxy/gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Amus retzidu un&apos;etichetta eletrònica diferente pro su riprìstinu. Torra a proare luego.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Amus retzidu sena nos ddu isetare unu content-lenght de s&apos;iscarrigamentu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Su serbidore at torradu unu content-range isballiadu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Connessione iscàdida</translation>
</message>
@@ -2157,83 +2174,85 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Agiornamentos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>controll&amp;a in automàticu si ddoe at agiornamentos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Canale</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stàbile</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Torra a aviare &amp;&amp; agiorna</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Controlla si immoe ddoe at agiornamentos </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avantzadu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Pedi cunfirma in antis de sincronizare cartellas prus mannas de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Pedi cunfirma in antis de sincronizare memòrias foranas</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Mustra is cartellas de sincronizatzione in su pannellu de navigatzione de &amp;Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Mustra su raportu de s&amp;rradura inatesu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Mustra &amp;Ignora archìvios</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Crea archìviu de debug …</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Serbidore de notìficas chi tocat a ddis dare contu.</translation>
</message>
@@ -2243,17 +2262,17 @@ Si custu fiat un&apos;errore e detzides de mantènnere is archìvios tuos, custo
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Non faghet a disativare s&apos;aviamentu automàticu ca est ativu s&apos;aviamentu automàticu a livellu de sistema.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Boles cambiare su canale de agiornamentu?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2262,32 +2281,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Annota chi custu seletzionat isceti dae cale grùstiu prelevare is agiornamentos e chi non ddoe apant downgrade: duncas, a su sòlitu non faghet a torrare deretu dae su canale beta a su canale istàbile e custu cheret nàrrere a isetare una versione istàbile chi siat prus reghente de sa versione beta chi ddoe est immoe.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Càmbia su canale de agiornamentu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Crea archìviu de debug</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Archìvios zip</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Archìviu debug creadu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>S&apos;archìviu de debug nch&apos;est creadu in %1</translation>
</message>
@@ -2647,7 +2666,7 @@ Logs ant a èssere iscritos in %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Errore</translation>
</message>
@@ -2657,7 +2676,7 @@ Logs ant a èssere iscritos in %1</translation>
<translation>&lt;nobr&gt;S&apos;archìviu &apos;%1&apos;&lt;br/&gt;no at fatu a ddu abèrrere in s&apos;iscritura.&lt;br/&gt;&lt;br/&gt;Su resurtadu de su log &lt;b&gt;no&lt;/b&gt; at a èssere sarvadu!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;S&apos;archìviu &apos;%1&apos;&lt;br/&gt;no faghet a dd&apos;abèrrere pro s&apos;iscritura.&lt;br/&gt;&lt;br/&gt;Su resurtadu de su log &lt;b&gt;no&lt;/b&gt; podet èssere sarvadu!&lt;/nobr&gt;</translation>
</message>
@@ -3545,12 +3564,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Su nùmene de s&apos;archìviu est in sa lista niedda de su serbidore.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>S&apos;archìviu at un&apos;estensione riservada a is archìvios virtuales.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>mannària</translation>
</message>
@@ -3565,22 +3584,22 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>su serbidore no at torradu perunu %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>id de s&apos;archìviu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3590,47 +3609,47 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>B&apos;at un&apos;iscòrriu carrighende unos archìvios a sa cartella. Cussos in iscòrriu ant a èssere cantzellados!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Iscòrriu carrighende una cartella. Custa s&apos;at a cantzellare!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Iscòrriu carrighende un&apos;archìviu. Custu s&apos;at a cantzellare!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignoradu ca in sa lista niedda de is cosas de no sincronizare</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Non podes ca non tenes su permissu pro agiùnghere sutacartellas a custas cartellas</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation> Non podes ca non tenes su permissu pro agiùnghere archìvios a custa cartella</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non podes carrigare custu archìviu ca in su serbidore podes isceti lèghere, riprìstinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Tramudadu a un&apos;indiritzu non bàlidu, riprìstinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Non ddu podes bogare, riprìstinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Errore leghende sa base de datos</translation>
</message>
@@ -3640,7 +3659,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Su serbidore at dadu errore leghende sa cartella &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Su serbidore nd&apos;at torradu un&apos;errore leghende sa cartella &quot;%1&quot; : %2</translation>
</message>
@@ -3681,44 +3700,44 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>S&apos;archìviu %1 non podet èssere iscarrigadu pro sa mancàntzia de informatziones de tzifradura.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation> S&apos;archìviu %1 non faghet a dd&apos;iscarrigare ca non b&apos;at informatziones de tzifradura.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Archìviu cambiadu in pessu rilevadu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>S&apos;archìviu %1 nn faghet a dd&apos;iscarrigare pro unu cunflitu cun su nùmene de s&apos;archìviu locale!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation> S&apos;archìviu %1 non podet èssere iscarrigadu pro unu cunflitu cun un&apos;archìviu locale!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>S&apos;iscarrigamentu at a torrare a suta de su lìmite su logu lìberu in su discu locale </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Su logu lìberu in su discu est prus pagu de %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>S&apos;archìviu est cantzelladu dae su serbidore</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>No at fatu a iscarrigare s&apos;archìviu de su totu</translation>
</message>
@@ -3728,12 +3747,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation> S&apos;archìviu iscarrigadu est bòidu mancari su serbidore indicaret una mannària de %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation> S&apos;archìviu iscarrigadu est bòidu, ma su serbidore at indicadu una mannària de %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>S&apos;archìviu %1 non podet èssere sarvadu pro unu cunflitu in unu&apos;archìviu locale!</translation>
</message>
@@ -3743,18 +3762,18 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Errore iscriende is metadatos in su base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Errore agiornende is metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>S&apos;archìviu %1 est giai impreadu</translation>
</message>
@@ -4141,7 +4160,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Annulla</translation>
</message>
@@ -4188,32 +4207,43 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>caminu de ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Maginedda</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>eticheta de cumpartzidura</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Caminu de Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Cartella: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Cumpartzidura %1 </translation>
</message>
@@ -4223,17 +4253,17 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Custu archìviu non faghet a ddu cumpartzire ca est cumpartzidu sena permissu.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>S&apos;archìviu non faghet ddu cumpartzire ca non tenet permissu de cumpartzidura.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Inserta una crae pro su ligòngiu tuo de cumpartzidura:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Crae pro cumpartzidura recherta</translation>
</message>
@@ -4246,7 +4276,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Crae:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Cumpartzi ligòngiu</translation>
</message>
@@ -4256,7 +4286,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Nota</translation>
</message>
@@ -4271,7 +4301,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Data de iscadèntzia:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Imposta crae</translation>
</message>
@@ -4281,7 +4311,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Iscadet:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Iscade</translation>
</message>
@@ -4376,27 +4406,27 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Cantzella ligòngiu de cumpartzidura</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Cunfirma de cantzellare su ligòngiu</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;A beru nche boles cantzellare sa cumpartzidura a su ligòngiu pùblicu&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Avisu: custa operatzione non si podet annullare.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Cantzella</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Ligòngiu pùblicu</translation>
</message>
@@ -4404,7 +4434,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Cumpartzi cun utentes e grupos ...</translation>
</message>
@@ -4414,7 +4444,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Chirca globale</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Còpia ligòngiu</translation>
</message>
@@ -4424,22 +4454,22 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Perunu resurtadu pro &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Perunu resurtadu pro &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Recherta sa crae pro cumpartzire</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Inserta•nche una crae pro su ligòngiu tuo de cumpartzidura:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Apo cumpartzidu una cosa cun tegus</translation>
</message>
@@ -4447,7 +4477,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Nùmene utente</translation>
</message>
@@ -4457,62 +4487,62 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>faghet a modificare</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Podet modificare</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Nota:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Crae:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Iscadet:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Faghet a torrare a cumpartzire</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Nota a sa persone destinatària</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Imposta data de iscadèntzia</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Annulla sa cumpartzidura</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Faghet a creare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Faghet a cambiare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Faghet a cantzellare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Bardiadura cun crae</translation>
</message>
@@ -4539,13 +4569,13 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Seletziona positzione noa ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Apo cumpartzidu una cosa cun tegus</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Sèberos de cumpartzidura</translation>
</message>
@@ -4555,79 +4585,100 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Cumpartzi tràmite %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Còpia ligòngios privados in punta de billete</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Imbia unu ligòngiu privadu tràmite posta eletrònica ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Non faghet a torrare a cumpartzire</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Non faghet a torrare a cumpartzire custa cartella</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Còpia ligòngiu pùblicu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Còpia ligòngiu internu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Modìfica </translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Aberi in su navigadore</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Isorve cunflitu ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Tràmuda e torra a numenare ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Tràmuda, torra a numenare e carriga ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Cantzella càmbios locales</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Tràmuda e carriga ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Cantzella</translation>
</message>
@@ -5203,29 +5254,29 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Agiunghe contu</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Aberi sa bentana printzipale</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pone in pasu sa sincronizatzione</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Torra a cumintzare sa sincronizatzione</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Impostatziones</translation>
</message>
@@ -5235,22 +5286,22 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Essi·nche dae %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pone in pasu sa sincronizatzione de totu</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Torra a cumintzare sa sincronizatzione de totu</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5258,24 +5309,24 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Cliente de iscrivania&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Versione %1. Pro àteras informatziones incarca &lt;a href=&apos;%2&apos;&gt;inoghe&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Impreende s&apos;estensione de archìvios virtuales: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Custa versione est dispensada dae %1&lt;/p&gt;</translation>
</message>
@@ -5283,22 +5334,22 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5306,7 +5357,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Torra a proare totu is carrigamentos</translation>
</message>
@@ -5339,22 +5390,22 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Cunfirma bogada de su contu</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;A beru nche cheres bogare sa connessione a su contu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Mira:&lt;/b&gt; custu &lt;b&gt;no at a&lt;/b&gt; cantzellare perunu archìviu.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Boga connessione</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@@ -6016,7 +6067,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Cartella noa</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6125,7 +6176,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>No at fatu a si connètere sa base de datos.</translation>
</message>
@@ -6146,7 +6197,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6170,7 +6221,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6208,7 +6259,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Contu non connètidu</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Atziones de su contu</translation>
</message>
@@ -6218,18 +6269,18 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Boga·nche su contu</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Imposta istadu</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Essi·nche</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Intra</translation>
@@ -6243,52 +6294,52 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Istadu in lìnia</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>In lìnia</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Ausente</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>No istorbes</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Invisìbile</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Messàgiu de istadu</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Cale est s&apos;istadu tuo?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Lìmpia su messàgiu de istadu a pustis</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Lìmpia su messàgiu de istadu</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Imposta messàgiu de istadu</translation>
</message>
@@ -6374,12 +6425,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation> S&apos;archìviu iscarrigadu non torrat cun su còdighe de controllu, at a èssere ripristinadu. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>S&apos;intestatzione de controllu cunteniat una genia de còdighe de controllu &quot;%1&quot; disconnotu</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation> S&apos;archìviu iscarrigadu non torrat cun su còdighe de controllu, at a èssere ripristinadu. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6387,98 +6438,93 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Bentana printzipale de Nextcloud de iscrivania</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Contu atuale</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Riprìstina sincronizatzione pro totu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pone in pasu sincronizatzione pro totu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Imposta istadu de s&apos;utente</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Agiunghe contu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Agiunghe unu contu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Impostatziones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Essi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar atuale de s&apos;utente</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>S&apos;istadu atuale de s&apos;utente est in lìnia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>S&apos;istadu atuale de s&apos;utente est chi non si cheret istorbadu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Ischertadore de contu e impostatziones de su menu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Aberi sa cartella locale in su contu atuale</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Connètidu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Disconnètidu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Aberi Nextcloud Talk in su navigadore</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Àteras aplicatziones</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menu de aplicatziones</translation>
@@ -6499,7 +6545,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Aberi bentana de cumpartzidura</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Àteras aplicatziones</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Aberi %1 in su navigadore</translation>
</message>
@@ -6510,7 +6561,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Mustra àteras atziones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6520,7 +6571,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Cumpartzi %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6546,7 +6597,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Cumpiladu dae sa versione Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 impreende Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 8321f748c..129ddb60d 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Otvoriť %1 lokálne</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>V %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Odmietnuť</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Otvoriť dialógové okno zdieľania</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemonické šifrovanie medzi koncovými bodmi</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Pre ochranu vašej kryptografickej identity, šifrujeme ju pomocou 12 mnemotechnických slov slovníka. Poznačte si ich a uschovajte ich. Budú potrebné na pridanie ďalších zariadení do vášho účtu (napríklad mobilného telefónu alebo notebooku).</translation>
</message>
@@ -734,47 +752,47 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Odhlásené</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Odpojené</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Pripojené</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Mód údržby</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Chyba siete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Chyba nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Zisťujem prihlasovacie údaje</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Neznámy stav účtu</translation>
</message>
@@ -782,17 +800,17 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Pre viac aktivít otvorte aplikáciu Aktivity.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Súbory zo zoznamu ignorovaných ako aj symbolické linky sa nesynchronizujú.</translation>
</message>
@@ -853,42 +871,42 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Pokračovanie bude znamenať &lt;b&gt;zmazanie týchto nastavení &lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Pokračovanie bude znamenať &lt;b&gt;ignorovanie týchto nastavení &lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Niektoré nastavenia boli nakonfigurované v novších verziách tohto klienta a používajú funkcie, ktoré v tejto verzii nie sú k dispozícii.&lt;br&gt;&lt;br&gt;% 1&lt;br&gt;&lt;br&gt;Aktuálny konfiguračný súbor bol už zálohovaný do &lt;i&gt;% 2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Ukončiť</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Pokračovať</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Chyba pri prístupe ku konfiguračnému súboru</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Pri prístupe ku konfiguračnému súboru na %1 sa vyskytla chyba. Uistite sa, že váš používateľ má prístup k súboru.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Ukončiť %1</translation>
</message>
@@ -930,7 +948,6 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Súbor %1 má neplatný čas poslednej zmeny. Nenahrávajte ho na server.</translation>
</message>
@@ -1203,8 +1220,8 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
<translation>V odpovedi servra na objavovanie súboru chýbajú údaje.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Chyba servera: odpoveď PROPFIND nie je vo formáte XML.</translation>
</message>
@@ -1960,12 +1977,12 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Pridať prepojenie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Pridať synchronizačné pripojenie</translation>
</message>
@@ -1983,7 +2000,7 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<translation>Zadajte cestu do lokálneho priečinka.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Vyberte zdrojový priečinok</translation>
</message>
@@ -1991,7 +2008,7 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Vytvoriť vzdialený priečinok</translation>
</message>
@@ -2001,47 +2018,47 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<translation>Zadajte názov nového priečinka, ktorý bude vytvorený v &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Zadajte názov nového priečinka, ktorý bude vytvorený v &quot;%1&quot;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Priečinok bol úspešne vytvorený na %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Zlyhalo overenie pri pripojení %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Na %1 zlyhalo vytvorenie priečinka. Skontrolujte to, prosím, ručne.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Chyba pri zobrazení priečinka: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Zvoľte pre synchronizáciu celého účtu</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Tento priečinok sa už synchronizuje.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Priečinok &lt;i&gt;%1&lt;/i&gt; už synchronizujete a je nadradený priečinku &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Už synchronizujete &lt;i&gt;%1&lt;/i&gt;, čo je podzložka &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2049,24 +2066,24 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Použiť virtuálne súbory namiesto okamžitého sťahovania lokálneho obsahu %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimentálne)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Virtuálne súbory nie sú podporované na koreňovej partícii Windows ako lokálny priečinok. Prosím vyberte validný priečinok pod písmenom disku.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuálne súbory sú nedostupné pre vybraný priečinok</translation>
</message>
@@ -2087,27 +2104,27 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Prijali sme neočakávaný Content-Length pri sťahovaní.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Server vrátil nesprávnu hodnotu Content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -2156,83 +2173,85 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Aktualizácie</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Automaticky kontrolovať aktualizácie</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanál</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabilné</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Restart &amp;&amp; aktualizácia</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Skontrolovať dostupnosť aktualizácie</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Rozšírené</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Požiadať o potvrdenie pred synchronizáciou priečinkov väčších než</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Požiadať o potvrdenie pred synchronizáciou externých úložísk</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Zobraziť synchronizované priečinky v paneli navigáci&amp;e Prieskumníka</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Z&amp;obraziť hlásenia o pádoch</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Editovať &amp;ignorované súbory</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Vytvoriť archív s informáciami pre ladenie...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Zobrazovať hlásenie, ktoré vyžadujú pozornosť.</translation>
</message>
@@ -2242,17 +2261,17 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Nemôžete vypnúť autoštart pretože autoštart je zapnutý na systémov úrovni.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Zmeniť aktualizáciu kanálu?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Upozorňujeme, že sa tým vyberie iba to, odkiaľ sa aktualizácie budú sťahovať, a že nedôjde k nijakému downgrade. Takže návrat z beta kanála do stabilného kanála sa zvyčajne nedá vykonať okamžite a znamená čakať na stabilnú verziu, ktorá je novšia ako aktuálne nainštalovaná beta verzia.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Zmeniť aktualizáciu kanálu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Vytvoriť debug archív</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip archívy</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Archív ladiacich informácii vytvorený</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Archív ladiacich informácií vytvorený %1</translation>
</message>
@@ -2647,7 +2666,7 @@ Záznamy udalostí sa budú zapisovať do %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
@@ -2657,7 +2676,7 @@ Záznamy udalostí sa budú zapisovať do %1</translation>
<translation>&lt;nobr&gt;Súbor &apos;%1&apos;&lt;br/&gt;nesmie byť otvorený pre proces úprav.&lt;/br/&gt;&lt;br/&gt;Systémový záznam (log) &lt;b&gt;nemôže&lt;/b&gt; byť uložený!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Súbor &quot;%1&quot;&lt;br/&gt;nie je možné otvoriť pre úpravu.&lt;br/&gt;&lt;br/&gt;Systémový záznam - log &lt;b&gt;nemôže&lt;/b&gt; byť uložený!&lt;/nobr&gt;</translation>
</message>
@@ -3545,12 +3564,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Súbor je na tomto serveri na čiernej listine.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Prípona súboru je rezervovaná pre virtuálne súbory.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>veľkosť</translation>
</message>
@@ -3565,22 +3584,22 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>server nevrátil žiadne %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>oprávnenie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>id súboru</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Server nevrátil žiadne %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3590,47 +3609,47 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Konflikt pri nahrávaní niektorých súborov do priečinka. Konfliktné súbory budú odstránené!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Konflikt pri nahrávaní priečinka. Bude odstránený!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Konflikt pri nahrávaní súboru. Bude odstránený!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorované podľa nastavenia &quot;vybrať čo synchronizovať&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Nie je dovolené, lebo nemáte oprávnenie pridávať podpriečinky do tohto priečinka</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Nie je možné, pretože nemáte oprávnenie pridávať súbory do tohto priečinka</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie, obnovujem</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Presunuté do neplatného cieľa, obnovujem</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolené odstrániť, obnovujem</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Chyba pri čítaní z databáze</translation>
</message>
@@ -3640,7 +3659,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Server odpovedal chybne počas čítania adresára &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Server odpovedal chybne počas načítania priečinka &quot;%1&quot; : %2</translation>
</message>
@@ -3681,44 +3700,44 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Súbor %1 nie je možné prevziať, pretože chýbajú informácie o šifrovaní.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Súbor %1 nie je možné prevziať, pretože chýbajú informácie o šifrovaní.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Súbor sa medzitým zmenil</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Sťahovanie by znížilo miesto na lokálnom disku pod nastavený limit </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Voľné miesto na disku je menej ako %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Súbor bol vymazaný zo servera</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Súbor sa nedá stiahnuť úplne.</translation>
</message>
@@ -3728,12 +3747,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Prebratý súbor je prázdny napriek tomu, že server oznámil, že mal mať %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Prebratý súbor je prázdny napriek tomu, že server oznámil, že mal mať %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
</message>
@@ -3743,18 +3762,18 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Chyba pri zápise metadát do databázy</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Súbor %1 má neplatný čas poslednej zmeny nahlásený serverom. Neukladajte si to.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Chyba pri aktualizácii metadát: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Súbor %1 sa v súčasnosti používa</translation>
</message>
@@ -4141,7 +4160,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Odmietnuť</translation>
</message>
@@ -4188,32 +4207,43 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>ownCloud cesta:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>zdieľať značku</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Cesta Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Štítok</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Priečinok: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 zdieľanie</translation>
</message>
@@ -4223,17 +4253,17 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Tento súbor nemožno zdieľať, lebo bol vyzdieľaný bez možnosti ďalšieho zdieľania.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Tento súbor nemožno zdieľať, pretože nemá práva pre zdieľanie.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Zadajte heslo pre sprístupnenie pomocou odkazu:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Pre sprístupnenie je potrebné heslo</translation>
</message>
@@ -4246,7 +4276,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Heslo:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Sprístupniť odkaz</translation>
</message>
@@ -4256,7 +4286,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Poznámka:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Poznámka</translation>
</message>
@@ -4271,7 +4301,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Dátum vypršania:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Nastaviť heslo</translation>
</message>
@@ -4281,7 +4311,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Platí do:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Vyprší</translation>
</message>
@@ -4376,27 +4406,27 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Zmazať sprístupnený odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Potvrdzovať rušenie sprístupnenia</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Naozaj chcete vymazať odkaz pre verejné sprístupnenie &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Pozn.: túto akciu nie je možné vrátiť späť.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Zmazať</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Verejný odkaz</translation>
</message>
@@ -4404,7 +4434,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Zdieľať s používateľmi alebo skupinami ...</translation>
</message>
@@ -4414,7 +4444,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Hľadať globálne</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopírovať odkaz</translation>
</message>
@@ -4424,22 +4454,22 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Žiadne výsledky pre &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Žiadne výsledky pre &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Pre sprístupnenie je potrebné heslo</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Zadajte heslo pre sprístupnenie pomocou emailu:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Niečo som vám sprístupnil</translation>
</message>
@@ -4447,7 +4477,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Užívateľské meno</translation>
</message>
@@ -4457,62 +4487,62 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>môže upraviť</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Môže upravovať</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Poznámka:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Heslo:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Platnosť končí:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Môže sprístupniť aj iným</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Poznámka pre príjemcu</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Nastaviť dátum expirácie</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Zneprístupniť</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Môže vytvárať</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Môže meniť</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Môže odstraňovať</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Chrániť heslom</translation>
</message>
@@ -4539,13 +4569,13 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Zadajte novú polohu ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Niečo som vám sprístupnil</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Možnosti zdieľania</translation>
</message>
@@ -4555,79 +4585,100 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Sprístupniť prostredníctvom %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Aktivity</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopírovať privátny odkaz do schránky</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Odoslať privátny odkaz e-mailom…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Opätovné sprístupňovanie tohto súboru je zakázané</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Opätovné zdieľanie tohto adresára je zakázané</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopírovať verejný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopírovať interný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Upraviť</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Otvoriť v prehliadači</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Vyriešiť konflikt ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Presunúť a premenovať ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Presunúť. remenovať a nahrať ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Zrušiť lokálne zmeny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Presunúť a nahrať ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Zmazať</translation>
</message>
@@ -5203,29 +5254,29 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Pridať účet</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Otvoriť hlavné dialógové okno</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pozastaviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Pokračovať v synchronizácii</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Nastavenia</translation>
</message>
@@ -5235,22 +5286,22 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Ukončiť %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pozastaviť synchronizáciu pre všetky účty</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Pokračovať v synchronizácii pre všetky účty</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5258,24 +5309,24 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Klient %1 pre počítač&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Verzia %1. Viac informácií získate &lt;a href=&apos;%2&apos;&gt;kliknutím sem&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Používa zásuvný modul virtuálnych súborov: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Toto vydanie bolo poskytnuté %1&lt;/p&gt;</translation>
</message>
@@ -5283,22 +5334,22 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Nepodarilo sa načítať poskytovateľov.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Nepodarilo sa načítať poskytovateľov vyhľadávania pre „%1“. Chyba: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Vyhľadávanie &apos;%2&apos; zlyhalo.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Vyhľadávanie &apos;%1&apos; zlyhalo. Chyba: %2</translation>
</message>
@@ -5306,7 +5357,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Zopakovať všetky nahrávania</translation>
</message>
@@ -5339,22 +5390,22 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte ostránenie účtu</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Naozaj chcete odstrániť pripojenie k účtu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Týmto sa &lt;b&gt;neodstránia&lt;/b&gt; žiadne súbory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Vymazať prepojenie</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
@@ -6016,7 +6067,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Nový priečinok</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Označiť ako prečítané</translation>
</message>
@@ -6125,7 +6176,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Nepodarilo sa pripojiť k databáze.</translation>
</message>
@@ -6146,7 +6197,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Vyhľadať súbory, správy, udalosti ...</translation>
</message>
@@ -6170,7 +6221,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Načítať viac výsledkov</translation>
</message>
@@ -6208,7 +6259,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Účet nie je pripojený</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Možnosti účtu</translation>
</message>
@@ -6218,18 +6269,18 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Odobrať účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Nastaviť stav</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Odhlásiť</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Prihlásiť sa</translation>
@@ -6243,52 +6294,52 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Stav pripojenia</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Pripojené</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Preč</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Nerušiť</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Neviditeľný</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Správa o stave</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Aký je váš stav?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Vyčistiť správu o stave po</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Vyčistiť správu o stave</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Nastaviť správu o stave</translation>
</message>
@@ -6374,12 +6425,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Stiahnutý súbor nemá správny kontrolný súčet, bude stiahnutý znovu. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Hlavička kontrolného súčtu obsahovala neznámy typ kontrolného súčtu „%1“</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Stiahnutý súbor nemá správny kontrolný súčet, bude stiahnutý znovu. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6387,98 +6438,93 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Hlavné dialógové okno pracovnej plochy Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Aktuálny účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Pokračovať v synchronizácii pre všetky účty</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pozastaviť synchronizáciu pre všetky účty</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Nastaviť status užívateľa</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Pridať účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Pridať nový účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Ukončiť</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Avatar aktuálneho užívateľa</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Stav aktuálneho užívateľa je pripojený</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Stav aktuálneho užívateľa je nerušiť</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Prepínač účtov a menu nastavení</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Otvoriť lokálny priečinok aktuálneho účtu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Pripojené</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Odpojené</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Otvoriť Nextcloud Talk v prehliadači</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Viac aplikácií</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Menu aplikácií</translation>
@@ -6499,7 +6545,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Otvoriť dialógové okno sprístupnenia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Viac aplikácií</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
@@ -6510,7 +6561,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Zobraziť ďalšie akcie</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Jednotný zoznam výsledkov vyhľadávania</translation>
</message>
@@ -6520,7 +6571,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Sprístupniť %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Aktivita súboru</translation>
</message>
@@ -6546,7 +6597,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Zostavené z Git revízie &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 s použitím Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index 0631f3d14..adca38665 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Odpri datoteko %1 krajevno</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Mnemonika celostnega šifriranja</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Za zaščito vaše kriptografske istovetnosti se ta šifrira z uporabo 12 slovarskih besed. Te je priporočljivo zabeležiti in jih varno shraniti. Brez njih ni mogoče dodati drugih naprav v račun (kot sta mobilni telefon in prenosni računalnik).</translation>
</message>
@@ -734,47 +752,47 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Odjavljeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Povezano</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Storitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Vzdrževalni način</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Omrežna napaka</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Napaka nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Zahteva po poverilih</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Neznano stanje računa</translation>
</message>
@@ -782,17 +800,17 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Za izpis več dejavnosti odprite program Dejavnost</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Datoteke, ki so na seznamu neusklajevanja, in simbolne povezave se ne usklajujejo.</translation>
</message>
@@ -853,42 +871,42 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>Nadaljevanje pomeni &lt;b&gt;brisanje teh nastavitev&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>Nadaljevanje pomeni, da bodo &lt;b&gt;nastavitve prezrte&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Nekatere nastavitve so bile nastavljene v novejši različici programa in vključujejo možnosti, ki v trenutni različici niso na voljo.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Za trenutno uporabljeno nastavitveno datoteko je varnostna kopija že shranjena na &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Končaj</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Nadaljuj</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Napaka dostopa do nastavitvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Med dostopom do nastavitvene datoteke na %1 je prišlo do napake. Preverite, ali je dostopna z uporabniškim računom.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Končaj %1</translation>
</message>
@@ -930,7 +948,6 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1203,8 +1220,8 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
<translation>Strežniški odziv odkrivanja datotek je brez podatkov.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Napaka strežnika: odziv PROPFIND ni zapisan kot XML!</translation>
</message>
@@ -1960,12 +1977,12 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Dodaj povezavo za usklajevanje mape</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Dodaj povezavo za usklajevanje</translation>
</message>
@@ -1983,7 +2000,7 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<translation>Vpišite pot do krajevne mape.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Izbor izvorne mape</translation>
</message>
@@ -1991,7 +2008,7 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Ustvari oddaljeno mapo</translation>
</message>
@@ -2001,47 +2018,47 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<translation>Ime mape, ki bo ustvarjena kot podrejena »%1«:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Vpišite ime mape, ki bo ustvarjena kot podrejena »%1«:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Mapa na %1 je uspešno ustvarjena.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Overitev dostopa do %1 je spodletela.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Ustvarjanje mape na %1 je spodletelo. Morda jo je mogoče ustvariti ročno.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Napaka izpisovanja datotek mape. Napaka: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Izberite možnost za usklajevanje celotnega računa.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Ta mapa je že določena za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Mapa &lt;i&gt;%1&lt;/i&gt; se že usklajuje, ker je nadrejena &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Mapa &lt;i&gt;%1&lt;/i&gt; se že usklajuje, ker je podrejena mapi &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -2049,24 +2066,24 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Uporabi možnost navideznih datotek namesto prejemanja celotne vsebine %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(preizkusno)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Kot krajevne datoteke na ravni korenske mape v okolju Windows navidezne datoteke niso podprte. Izbrati je treba ustrezno podrejeno mapo na črkovnem pogonu.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Navidezne datoteke niso na voljo za izbrano mapo</translation>
</message>
@@ -2087,27 +2104,27 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake E-Tag s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Zaznana je nepričakovana zahteva za prejem Vsebine-Dolžine.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Povezava je časovno potekla</translation>
</message>
@@ -2156,83 +2173,85 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Posodobitve</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Samodejno preveri za posodobitve</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabilni</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>preizkusni</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Ponovno zaženi in posodobi</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Preveri za posodobitve</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Napredne možnosti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Zahtevaj potrditev pred usklajevanjem map, večjih od</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Vprašaj za potrditev pred usklajevanjem zunanjih shramb</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Pokaži mape usklajevanja v bočnem oknu programa &amp;Explorer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Pokaži &amp;poročilo o sesutu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Uredi &amp;neusklajevane datoteke</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Ustvari arhiv razhroščevanja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Prejeto je obvestilo strežnika, ki zahteva pozornost.</translation>
</message>
@@ -2242,17 +2261,17 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Samodejnega zagona ni mogoče izklopiti, ker je ta omogočen sistemsko.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Ali želite zamenjati kanal za posodobitve?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Zavedati se je treba, da izbor določa le različice programske opreme za nadgradnjo in da povrnitev na starejše različice ni več mogoča. Povrnitev iz preizkusnega kanala Beta na Stabilnega ni mogoča, dokler stabilna različica ni višja oziroma novejša od nameščene preizkusne različice. </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Spreminjanje kanala posodobitev</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Ustvari arhiv razhroščevanja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Arhivi ZIP</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Arhiv razhroščevanja je ustvarjen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Arhiv razhroščevanja je ustvarjen na %1</translation>
</message>
@@ -2645,7 +2664,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
@@ -2655,7 +2674,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Datoteke »%1«&lt;br/&gt;ni mogoče odpreti za pisanje.&lt;br/&gt;&lt;br/&gt;Dnevniškega zapisa &lt;b&gt;ni mogoče&lt;/b&gt; shraniti!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Datoteke »%1«&lt;br/&gt;ni mogoče odpreti za pisanje.&lt;br/&gt;&lt;br/&gt;Dnevniškega zapisa &lt;b&gt;ni mogoče&lt;/b&gt; shraniti!&lt;/nobr&gt;</translation>
</message>
@@ -3544,12 +3563,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Ime datoteke je na črnem seznamu strežnika.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Datoteka ima predpono, ki je zadržana za navidezne datoteke.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>velikost</translation>
</message>
@@ -3564,22 +3583,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>prejet je odziv strežnika %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>dovoljenje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>ID datoteke</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Prejet je odziv strežnika %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3589,47 +3608,47 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Zaznan je spor pri nalaganju nekaterih datotek v mapo. Spori bodo samodejno počiščeni!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Zaznan je spor pri pošiljanju mape. Mapa bo počiščena!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Zaznan je spor pri pošiljanju datoteke. Datoteka bo odstranjena!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Predmet ni usklajevan, ker je na »črnem seznamu datotek« za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Te datoteke ni dovoljeno poslati, 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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Predmet je premaknjen na neveljaven cilj, vsebina bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranjevanje ni dovoljeno, vsebina bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Napaka branja podatkovne zbirke</translation>
</message>
@@ -3639,7 +3658,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation>
</message>
@@ -3680,44 +3699,44 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Datoteke %1 ni mogoče prejeti zaradi manjkajočih podatkov šifriranja!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>Datoteke %1 ni mogoče prejeti zaradi manjkajočih podatkov šifriranja!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Datoteka je bila spremenjena po usklajevanju seznama datotek</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Prejem predmetov bi zmanjšal prostor na krajevnem disku pod določeno omejitev.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Na disku je prostora manj kot %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Datoteka je izbrisana s strežnika</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Datoteke ni mogoče prejeti v celoti.</translation>
</message>
@@ -3727,12 +3746,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Prejeta datoteka je prazna, čeprav je s strešnika javljena velikost %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>Prejeta datoteka je prazna, čeprav je na strežniku velikosti %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
</message>
@@ -3742,18 +3761,18 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Prišlo je do napake posodabljanja metapodatkov: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
@@ -4140,7 +4159,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Opusti</translation>
</message>
@@ -4187,32 +4206,43 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Pot do OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikona</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>deli oznako</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Pot Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Besedilna oznaka</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Mapa: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 souporaba datotek</translation>
</message>
@@ -4222,17 +4252,17 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Datoteke ni mogoče dodeliti v souporabo, ker ni navedenih ustreznih dovoljenj.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Datoteke ni mogoče dodeliti v souporabo, ker ni navedenih ustreznih dovoljenj.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Vpisati je treba geslo za mesto souporabe prek povezave:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Zahtevano je geslo za mesto souporabe</translation>
</message>
@@ -4245,7 +4275,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Geslo:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Povezava za souporabo</translation>
</message>
@@ -4255,7 +4285,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Opomba:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Opomba</translation>
</message>
@@ -4270,7 +4300,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Datum preteka:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Nastavi geslo</translation>
</message>
@@ -4280,7 +4310,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Preteče:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Poteče</translation>
</message>
@@ -4375,27 +4405,27 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Izbriši povezavo za souporabo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Potrdi brisanje povezave do mesta souporabe</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ali res želite izbrisati javno povezavo do mesta souporabe &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Opomba: opravila ni mogoče povrniti.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Izbriši</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Javna povezava</translation>
</message>
@@ -4403,7 +4433,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Souporaba z uporabniki ali skupinami ...</translation>
</message>
@@ -4413,7 +4443,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Išči splošno</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopiraj povezavo</translation>
</message>
@@ -4423,22 +4453,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Za iskalni niz »%1« ni zadetkov</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Za iskalni niz »%1« ni zadetkov</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Zahtevano je geslo za mesto souporabe</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Vpisati je treba geslo za mesto souporabe prek elektronske pošte:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Nekaj vam dajem v souporabo</translation>
</message>
@@ -4446,7 +4476,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Uporabniško ime</translation>
</message>
@@ -4456,62 +4486,62 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>lahko ureja</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Lahko ureja</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Opomba:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Geslo:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Poteče:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Lahko omogoči souporabo</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Sporočilo za prejemnika</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Nastavi datum preteka</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Prekini souporabo</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Lahko ustvari</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Lahko spremeni</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Lahko izbriše</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Zaščiti z geslom</translation>
</message>
@@ -4538,13 +4568,13 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Izbor novega mesta ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Nekaj vam dajem v souporabo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Možnosti souporabe</translation>
</message>
@@ -4554,79 +4584,100 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Souporaba prek %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Dejavnosti</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopiraj zasebno povezavo v odložišče</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Pošlji zasebno povezavo prek elektronske pošte ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Nadaljnje omogočanje souporabe ni dovoljeno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Nadaljnje omogočanje souporabe mape ni dovoljeno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopiraj javno povezavo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopiraj krajevno povezavo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Uredi</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Odpri v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Razreši spor ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Premakni in preimenuj ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Premakni, preimenuj in pošlji ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Izbriši krajevne spremembe</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Premakni in pošlji ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Izbriši</translation>
</message>
@@ -5202,29 +5253,29 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Odpri glavno pogovorno okno</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Ustavi usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Nadaljuj z usklajevanjem</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Nastavitve</translation>
</message>
@@ -5234,22 +5285,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Končaj %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Ustavi usklajevanje za vse</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Nadaljuj z usklajevanjem za vse</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5257,24 +5308,24 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;Namizni program %1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Nameščena je različica %1. Več podrobnosti je zabeleženih v &lt;a href=&apos;%2&apos;&gt;priročniku Nextcloud&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Uporablja vstavek navideznih datotek: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Objavo je omogočila skupina %1&lt;/p&gt;</translation>
</message>
@@ -5282,22 +5333,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Pridobivanje ponudnikov je spodletelo.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>Spodletelo je pridobivanje ponudnikov iskanja za »%1«. Napaka %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Iskanje »%2« je spodletelo.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Iskanje »%1« je spodletelo. Napaka: %2</translation>
</message>
@@ -5305,7 +5356,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Ponovi pošiljanje vseh predmetov</translation>
</message>
@@ -5338,22 +5389,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Potrdi odstranjevanje računa</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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; odstranitev povezave &lt;b&gt;ne izbriše&lt;/b&gt; nobene datoteke.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Odstrani povezavo</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
@@ -6015,7 +6066,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Nova mapa</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6124,7 +6175,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Vzpostavljanje povezave s podatkovno zbirko je spodletelo.</translation>
</message>
@@ -6145,7 +6196,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Iskanje datotek, sporočil, dogodkov ...</translation>
</message>
@@ -6169,7 +6220,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Naloži več zadetkov</translation>
</message>
@@ -6207,7 +6258,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Račun ni povezan</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Dejanja računa</translation>
</message>
@@ -6217,18 +6268,18 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Odstrani račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Nastavi stanje</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Log in</translation>
@@ -6242,52 +6293,52 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Povezano stanje</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Na voljo</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Ne spremljam</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Ne pustim se motiti</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Drugim nevidno</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Sporočilo stanja</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Kako želite nastaviti stanje?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Počisti sporočilo stanja po</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Počisti sporočilo stanja</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Nastavi sporočilo stanja</translation>
</message>
@@ -6373,12 +6424,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Prejeta datoteka ni skladna z nadzornim številom, zato bo prenos ponovljen. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Glava nadzorne vsote vsebuje neznano vrsto zapisa »%1«.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>Nadzorna vsota prejete datoteke ni skladna s varnostno nadzorno vsoto, zato bo prejem ponovljen. »%1« != »%2«</translation>
</message>
@@ -6386,98 +6437,93 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Glavni vmesnik namizja Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Trenutni račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Nadaljuj z usklajevanjem za vse</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Ustavi usklajevanje za vse</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Nastavi stanje uporabnika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Končaj</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Trenutna podoba uporabnika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Trenutno je uporabnik povezan</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Trenutno uporabnik ne želi motenj</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Preklopnik računov in meni nastavitev</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Odpri krajevno mapo v trenutnem računu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Povezano</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Odpri Nextcloud Talk v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Več programov</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Meni programov</translation>
@@ -6498,7 +6544,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Odpri pogovorno okno souporabe</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Več programov</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
@@ -6509,7 +6560,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Pokaži več možnosti</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Poenoten seznam zadetkov iskanja</translation>
</message>
@@ -6519,7 +6570,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation>Souporaba %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 – Dejavnost datoteke</translation>
</message>
@@ -6545,7 +6596,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Izgradnje iz predelave Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 z uporabo Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index 0db1414df..b63b3ff6e 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Мнемоник шифровања са краја на крај</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Да бисте заштитили Ваш криптографски идентитет, шифровали смо га са лако памтљивих 12 речи из речника. Запишите их и добро их чувајте. Биће Вам потребне да додате нове уређаје на Ваш налог (као нпр. мобилни или лаптоп).</translation>
</message>
@@ -730,47 +748,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Одјављен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Неповезан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Повезан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Услуга није доступна</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Режим одржавања</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Грешка мреже</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Грешка подешавања</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Питам за акредитиве</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Непознато стање налога</translation>
</message>
@@ -778,17 +796,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>За још активности отворите апликацију Активности.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -849,42 +867,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Грешка при приступању фајлу са подешавањима</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Догодила се грешка приликом учитавања фајла са подешавањима са %1. Проверите да ли корисник има приступ овом фајлу.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Напусти %1</translation>
</message>
@@ -926,7 +944,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1197,8 +1214,8 @@ This action will abort any currently running synchronization.</source>
<translation>У одговору са сервера за откривање фајлова недостају подаци.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1949,12 +1966,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Додај везу синхронизације фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Додај везу синхронизације</translation>
</message>
@@ -1972,7 +1989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Унесите путању до локалне фасцикле.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Изаберите изворну фасциклу</translation>
</message>
@@ -1980,7 +1997,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Прављење удаљене фасцикле</translation>
</message>
@@ -1990,47 +2007,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Унесите назив нове фасцикле која ће бити направљена у %1:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Фасцикла је успешно направљена на %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Неуспела аутентификација при приступу %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Нисам успео да направим фасциклу на %1. Проверите ручно.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Неуспех излиставања фасцикле. Грешка: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Ово изаберите да синхронизујете целокупан налог</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Ова фасцикла се већ синхронизује.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Већ синхронизујете &lt;i&gt;%1&lt;/i&gt;, која садржи фасциклу &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2038,24 +2055,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2076,27 +2093,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Нема е-ознаке са сервера. Проверите прокси или мрежни излаз</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Добијена је различита е-ознака за наставак преноса. Покушаћу поново следећи пут.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Сервер је вратио погрешан опсег садржаја</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Време за повезивање је истекло</translation>
</message>
@@ -2145,83 +2162,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Ажурирања</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Аутоматски проверавај за ажурирања</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Поново покрени и ажурирај</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Провери ажурирања сад</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Напредно</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Питај за потврду пре синхронизације фасцикли већих од</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Питај за потврду пре синхронизације спољашњих складишта</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Прикажи синхронизоване фасцикле у &amp;Експлореровом навигационом панелу</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>П&amp;рикажи извештавач о грешкама</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Уреди фајлове за &amp;игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Обавештења са сервера која захтевају пажњу.</translation>
</message>
@@ -2231,49 +2250,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2631,7 +2650,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
@@ -2641,7 +2660,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Фајл „%1“&lt;br/&gt;није уписив.&lt;br/&gt;&lt;br/&gt;Записник се &lt;b&gt;не може&lt;/b&gt; сачувати!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3524,12 +3543,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3544,22 +3563,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3569,47 +3588,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3619,7 +3638,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3660,44 +3679,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Фајл %1 се не може преузети јер недостају подаци о шифровању.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Фајл је измењен у међувремену</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Преузимање ће смањити слободно место на диску испод границе</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Слободан простор на диску је мањи од %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Фајл је обрисан са сервера</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Фајл није могао бити преузет у потпуности.</translation>
</message>
@@ -3707,12 +3726,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Преузети фајл је празан иако је сервер рекао да треба да је %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
</message>
@@ -3722,18 +3741,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Грешка при упису мета података у базу</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4120,7 +4139,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Откажи</translation>
</message>
@@ -4167,32 +4186,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>оунКлауд путања:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Икона</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>ознака дељења</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Некстклауд путања:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Текст ознака</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Фасцикла: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 дељење</translation>
</message>
@@ -4202,17 +4232,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Унесите лозинку за везу дељења:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Потребна лозинка за дељење</translation>
</message>
@@ -4225,7 +4255,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Лозинка:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Веза дељења</translation>
</message>
@@ -4235,7 +4265,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Белешка:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4250,7 +4280,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Датум истека:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Постави лозинку</translation>
</message>
@@ -4260,7 +4290,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Истиче:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4355,27 +4385,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Обриши везу дељења</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Потврдите брисање везе дељења</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Да ли стварно желите да обришете јавну везу дељења &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Белешка: ово је неповратна операција.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Обриши</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Откажи</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Јавна веза</translation>
</message>
@@ -4383,7 +4413,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Дели са корисницима или групама…</translation>
</message>
@@ -4393,7 +4423,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Копирај везу</translation>
</message>
@@ -4403,22 +4433,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Нема резултата за &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Поделио сам нешто са Вама</translation>
</message>
@@ -4426,7 +4456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Корисничко име</translation>
</message>
@@ -4436,62 +4466,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>може да мења</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Може да дели даље</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Укини дељење</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Може да креира унутар дељења</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Може да мења садржај унутар дељења</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Може да брише садржај унутар дељења</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4518,13 +4548,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Поделио сам нешто са Вама</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Опције дељења</translation>
</message>
@@ -4534,79 +4564,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Подели преко %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Копирај приватну везу у оставу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Пошаљи приватну везу е-поштом…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Поновно дељење није дозвољено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Копирај јавну везу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Копирај интерну везу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Измени</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Отвори у веб читачу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Избриши</translation>
</message>
@@ -5182,29 +5233,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Додај налог</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Отвори главни дијалог</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Поставке</translation>
</message>
@@ -5214,22 +5265,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Излаз %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5237,24 +5288,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 десктоп клијент&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Верзија %1. За више информација кликните &lt;a href=&apos;%2&apos;&gt;овде&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Ово издање је обезбедио %1&lt;/p&gt;</translation>
</message>
@@ -5262,22 +5313,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5285,7 +5336,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Понови сва отпремања</translation>
</message>
@@ -5318,22 +5369,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Потврдите уклањања налога</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Уклоните конекцију</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Поништи</translation>
</message>
@@ -5995,7 +6046,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6104,7 +6155,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6125,7 +6176,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6149,7 +6200,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6187,7 +6238,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Акције налога</translation>
</message>
@@ -6197,18 +6248,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Одјава</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Пријава</translation>
@@ -6222,52 +6273,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6353,12 +6404,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6366,98 +6417,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Тренутни налог</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Додај налог</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Поставке</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Изађи</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Повезан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Неповезан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Још апликација</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6478,7 +6524,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Још апликација</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Отвори %1 у прегледачу</translation>
</message>
@@ -6489,7 +6540,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6499,7 +6550,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6525,7 +6576,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Направљено од ГИТ ревизије &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; %3, %4 користећи QT %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 9af3a46db..f4400b726 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>Öppna %1 lokalt</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>End to end krypteringsord</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>För att skydda din krypteringsidentitet, krypterar vi den med en mnemoteknisk av 12 ord. Notera dessa ord och håll dem säkra. De kommer behövas för att lägga till andra enheter till ditt konto (t.ex. mobiltelefon eller laptop).</translation>
</message>
@@ -730,47 +748,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Utloggad</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Bortkopplad</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Ansluten</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Tjänsten är inte tillgänglig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Underhållsläge</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Nätverksfel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Konfigurationsfel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Frågar efter inloggningsuppgifter</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Okänd kontostatus</translation>
</message>
@@ -778,17 +796,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Öppna Aktivitetsappen för fler aktiviteter.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Filer från ignorerings-listan och symboliska länkar synkroniseras inte.</translation>
</message>
@@ -849,42 +867,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Avsluta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Fortsätt</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Kunde inte komma åt konfigurationsfilen</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Ett fel uppstod vid läsning av konfigurationsfil vid %1. Kontrollera att filen kan nås av din användare.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Avsluta %1</translation>
</message>
@@ -926,7 +944,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1199,8 +1216,8 @@ This action will abort any currently running synchronization.</source>
<translation>Svaret på serverfilsupptäckten saknar data.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverfel: PROPFIND-svar är inte XML-formaterat!</translation>
</message>
@@ -1951,12 +1968,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Lägg till mappsynkroniseringsanslutning</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Lägg till anslutning.</translation>
</message>
@@ -1974,7 +1991,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ange sökvägen till den lokala mappen.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Välj källmapp</translation>
</message>
@@ -1982,7 +1999,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Skapa fjärrmapp</translation>
</message>
@@ -1992,47 +2009,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Ange namnet på den nya mappen som skall skapas under &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>Ange namn på den mapp som ska placeras under &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Mappen skapades på %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Autentisering misslyckades att komma åt %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Det gick inte att skapa mappen på %1. Kontrollera manuellt.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Kunde inte lista en mapp. Felkod: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Välj detta för att synkronisera hela kontot</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Den här mappen synkroniseras redan.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Du synkrroniserar redan &lt;i&gt;%1&lt;/i&gt;, vilket är övermapp till &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2040,24 +2057,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>Använd virtuella filer istället för att ladda ner innehåll direkt %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(experimentell)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Windows stödjer inte virtuella filer direkt i rotkataloger. Välj en underkatalog.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuella filer är inte tillgängliga för den valda mappen</translation>
</message>
@@ -2078,27 +2095,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen E-Tag mottogs från servern, kontrollera proxy/gateway</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Nerladdningens storlek är inkorrekt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Servern returnerade felaktig content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -2147,83 +2164,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Uppdateringar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Automatisk kontroll av uppdateringar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>stabil</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>%Starta om &amp;&amp; Uppdatera</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Sök efter uppdateringar nu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Avancerad</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Fråga innan synkronisering av mappar större än</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Fråga innan synkronisering av externa lagringsytor</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Visa synkroniseringsmappar i &amp;utforskarens navigeringsfönster</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Visa krashrapporteraren</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Ändra &amp;ignorerade filer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Skapa felsökningsarkiv …</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Serveraviseringar som kräver uppmärksamhet.</translation>
</message>
@@ -2233,49 +2252,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Du kan inte deaktivera autostart eftersom autostart är aktiverat på systemnivå.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Ändra uppdateringskanal?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Ändra uppdateringskanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Skapa felsökningsarkiv</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip-arkiv</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Felsökningsarkiv skapat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>Felsökningsarkiv är skapat på %1</translation>
</message>
@@ -2633,7 +2652,7 @@ Loggar kommer att skrivas till %1</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Fel</translation>
</message>
@@ -2643,7 +2662,7 @@ Loggar kommer att skrivas till %1</translation>
<translation>&lt;nobr&gt;Filen &apos;%1&apos;&lt;br/&gt;kan inte öppnas för skrivning.&lt;br/&gt;&lt;br/&gt;Loggtexten kan &lt;b&gt;inte&lt;/b&gt; sparas!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3526,12 +3545,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Filnamnet är svartlistat på servern.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Filens ändelse är reserverad för virtuella filer.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>storlek</translation>
</message>
@@ -3546,22 +3565,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>servern svarade inte %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>behörighet</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>fil-ID</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Servern svarade inte %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3571,47 +3590,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Borttagning tillåts ej, återställer</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Fel uppstod när databasen skulle läsas</translation>
</message>
@@ -3621,7 +3640,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3662,44 +3681,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Fil %1 kan inte hämtas eftersom krypteringsinformation fattas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Filen har ändrats sedan upptäckten</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Filen %1 kan inte hämtas på grund av namnkonflikt med en lokal fil!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Hämtningen skulle reducera det fria diskutrymmet under gränsen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Ledigt utrymme är under %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Filen har tagits bort från servern</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Filen kunde inte hämtas fullständigt.</translation>
</message>
@@ -3709,12 +3728,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Den hämtade filen är tom trots att servern meddelade att den borde ha varit %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
</message>
@@ -3724,18 +3743,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 används för tillfället</translation>
</message>
@@ -4122,7 +4141,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Avfärda</translation>
</message>
@@ -4169,32 +4188,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Sökväg till ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Ikon</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>delningsetikett</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud-plats:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Textetikett</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Mapp: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 Delning</translation>
</message>
@@ -4204,17 +4234,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Filen kan inte delas eftersom den delades utan delningsrättigheter.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Filen kunde inte delas då den saknar delningsrättigheter.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Ange ett lösenord for din länkdelning:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Lösenord för delning krävs</translation>
</message>
@@ -4227,7 +4257,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Lösenord:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Dela länk</translation>
</message>
@@ -4237,7 +4267,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Notering:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Anteckning</translation>
</message>
@@ -4252,7 +4282,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Utgångsdatum:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Ange lösenord</translation>
</message>
@@ -4262,7 +4292,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Går ut:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Upphör</translation>
</message>
@@ -4357,27 +4387,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ta bort delad länk</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Bekräfta radering av delad länk</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen radera den publikt delade länken &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Obs: Den här åtgärden kan inte ångras.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Ta bort</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Publik länk</translation>
</message>
@@ -4385,7 +4415,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Dela med användare eller grupper ...</translation>
</message>
@@ -4395,7 +4425,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Sök globalt</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Kopiera länk</translation>
</message>
@@ -4405,22 +4435,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Inga resultat för &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>Inga resultat för &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Lösenord krävs för delning</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Ange ett lösenord för att dela via e-post:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Jag delade något med dig</translation>
</message>
@@ -4428,7 +4458,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Användarnamn</translation>
</message>
@@ -4438,62 +4468,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>kan redigera</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Kan redigeras</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Anteckning:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Lösenord:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Förfaller:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Kan dela vidare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Notering till mottagare</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Välj utgångsdatum</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Sluta dela</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Kan skapa</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Kan ändra</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Kan radera</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Lösenordsskydda</translation>
</message>
@@ -4520,13 +4550,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Välj ny plats …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Jag delade något med dig</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Delningsalternativ</translation>
</message>
@@ -4536,79 +4566,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Dela via %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kopiera privat länk till urklipp</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Skicka privat länk med e-post ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Vidaredelning av denna fil är inte tillåtet</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Vidaredelning av denna mapp är inte tillåtet</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Kopiera publik länk</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Kopiera intern länk</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Ändra</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Öppna i webbläsare</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Lös konflikt …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Flytta och byt namn …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Flytta, byt namn och ladda upp …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Radera lokala ändringar</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Flytta och ladda upp …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Ta bort</translation>
</message>
@@ -5184,29 +5235,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Lägg till konto</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Öppna huvuddialogen</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Återuppta synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Inställningar</translation>
</message>
@@ -5216,22 +5267,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Avsluta %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Pausa synkronisering för alla</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Återuppta synkronisering för alla</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5239,24 +5290,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Skrivbordsklient&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Version %1. För mer information klicka &lt;a href=&apos;%2&apos;&gt;här&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Denna release levererades av %1&lt;/p&gt;</translation>
</message>
@@ -5264,22 +5315,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Kunde inte hämta leverantörer</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>Sökningen &quot;%2&apos; misslyckades.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>Sökningen &quot;%1&apos;. Fel: %2.</translation>
</message>
@@ -5287,7 +5338,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Försök ladda upp igen</translation>
</message>
@@ -5320,22 +5371,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Bekräfta radering an kontot</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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 ta bort anslutningen till konto &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;OBS:&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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Ta bort anslutning</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -5997,7 +6048,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ny mapp</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6106,7 +6157,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Kunde inte koppla mot databasen.</translation>
</message>
@@ -6127,7 +6178,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Sök efter filer, meddelanden, händelser...</translation>
</message>
@@ -6151,7 +6202,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Visa fler resultat</translation>
</message>
@@ -6189,7 +6240,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Konto inte anslutet</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Kontoåtgärder</translation>
</message>
@@ -6199,18 +6250,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ta bort konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Välj status</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Logga ut</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Logga in</translation>
@@ -6224,52 +6275,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Status</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Borta</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Stör ej</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Osynlig</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Statusmeddelande</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Vad är din status?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Rensa status efter</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Rensa status</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Välj status</translation>
</message>
@@ -6355,12 +6406,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6368,98 +6419,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud-klient huvuddialog</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Nuvarande konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Återuppta synkronisering för alla</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Pausa synkronisering för alla</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Välj användarstatus</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Lägg till konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Lägg till nytt konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Inställningar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Avsluta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Nuvarande användaravatar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Användarens status är &quot;Online&quot;</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Användarens status är &quot;Stör ej&quot;</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Kontobytare och inställningsmeny</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Öppna lokal mapp för aktuellt konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Ansluten</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Bortkopplad</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Öppna Nextcloud Talk i webbläsaren</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Fler appar</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Appmeny</translation>
@@ -6480,7 +6526,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Öppna delningsdialogen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Fler appar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
@@ -6491,7 +6542,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Visa fler åtgärder</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Sammanlagda sökresultat</translation>
</message>
@@ -6501,7 +6552,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Dela %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - filhändelser</translation>
</message>
@@ -6527,7 +6578,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Byggd från Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; den %3, %4 med Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index f061b0f44..5eb214572 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
@@ -729,47 +747,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>ออกจากระบบแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>ไม่ได้เชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>เชื่อมต่อแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>บริการไม่พร้อมใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>โหมดการบำรุงรักษา</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>ข้อผิดพลาดเครือข่าย</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>การกำหนดค่าผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>กำลังขอข้อมูลประจำตัว</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>ไม่ทราบสถานะบัญชี</translation>
</message>
@@ -777,17 +795,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -848,42 +866,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>ออก</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>ดำเนินการต่อ</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>เกิดข้อผิดพลาดในการเข้าถึงไฟล์กำหนดค่า</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>ออกจาก %1</translation>
</message>
@@ -925,7 +943,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1198,8 +1215,8 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1938,12 +1955,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>เพิ่มการประสานข้อมูลให้ตรงกัน</translation>
</message>
@@ -1961,7 +1978,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>ป้อนเส้นทางไปยังโฟลเดอร์ต้นทาง</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>เลือกโฟลเดอร์ต้นฉบับ</translation>
</message>
@@ -1969,7 +1986,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>สร้างโฟลเดอร์รีโมท</translation>
</message>
@@ -1979,47 +1996,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>ใส่ชื่อของโฟลเดอร์ใหม่ที่จะถูกสร้างขึ้นภายใต้ &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>ใส่ชื่อของโฟลเดอร์ใหม่ที่จะถูกสร้างขึ้นภายใต้ &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>โฟลเดอร์ถูกสร้างขึ้นเรียบร้อยเมื่อ %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>การรับรองความถูกต้องล้มเหลวขณะกำลังเข้าถึง %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>ไม่สามารถสร้างโฟลเดอร์บน %1 กรุณาตรวจสอบด้วยตนเอง</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>แสดงรายการโฟลเดอร์ล้มเหลว ข้อผิดพลาด: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>เลือกตัวเลือกนี้เพื่อประสานข้อมูลบัญชีทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>โฟลเดอร์นี้ถูกประสานข้อมูลอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>คุณประสานข้อมูล &lt;i&gt;%1&lt;/i&gt; อยู่แล้ว ซึ่งเป็นโฟลเดอร์หลักของ &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2027,24 +2044,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2065,27 +2082,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>ไม่มี E-Tag ที่ได้รับจากเซิร์ฟเวอร์ กรุณาตรวจสอบพร็อกซี่หรือเกตเวย์</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>เราได้รับ E-Tag ที่แตกต่างกันสำหรับการทำงานต่อ กำลังลองใหม่ในครั้งถัดไป</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>เซิร์ฟเวอร์ส่งคืนช่วงของเนื้อหาที่ผิด</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>หมดเวลาการเชื่อมต่อ</translation>
</message>
@@ -2134,83 +2151,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>อัปเดต</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;เริ่มต้นใหม่ &amp;&amp; อัพเดท</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>ขั้นสูง</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>ถามก่อนที่จะประสานข้อมูลกับโฟลเดอร์ที่มีขนาดใหญ่กว่า</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>เมกะไบต์</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>ถามก่อนที่จะประสานข้อมูลกับพื้นที่จัดเก็บข้อมูลภายนอก</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>แ&amp;สดงรายงานความผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>แก้ไข&amp;ไฟล์ที่ถูกเพิกเฉย</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
</message>
@@ -2220,49 +2239,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2616,7 +2635,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
@@ -2626,7 +2645,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;ไฟล์ &apos;%1&apos;&lt;br/&gt;ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้&lt;br/&gt;&lt;br/&gt;ผลลัพธ์ของไฟล์ log &lt;b&gt;ไม่สามารถ&lt;/b&gt; บันทึกข้อมูลได้!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3507,12 +3526,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3527,22 +3546,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3552,47 +3571,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3602,7 +3621,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3643,44 +3662,44 @@ 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/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>การดาวน์โหลดจะช่วยลดพืนที่จัดเก็บภายในเครื่องที่ต่ำกว่าขีดจำกัด</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>พื้นที่ว่างในดิสก์น้อยกว่า %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>ดาวน์โหลดไฟล์ไม่สำเร็จ</translation>
</message>
@@ -3690,12 +3709,12 @@ 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/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
</message>
@@ -3705,18 +3724,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4103,7 +4122,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>ยกเลิก</translation>
</message>
@@ -4150,32 +4169,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>พาธ ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>แชร์ป้ายกำกับ</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>ป้ายข้อความ</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>โฟลเดอร์: %2 </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>การแชร์ %1</translation>
</message>
@@ -4185,17 +4215,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
@@ -4208,7 +4238,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/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation type="unfinished"/>
</message>
@@ -4218,7 +4248,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/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4233,7 +4263,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/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>ตั้งรหัสผ่าน</translation>
</message>
@@ -4243,7 +4273,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/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4338,27 +4368,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>ยืนยันการลบลิงค์ที่แชร์</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการลบลิงค์ที่แชร์แบบสาธารณะ&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;หมายเหตุ: ไม่สามารถยกเลิกการดำเนินการนี้ได้&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>ลบ</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>ลิงค์สาธารณะ</translation>
</message>
@@ -4366,7 +4396,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation type="unfinished"/>
</message>
@@ -4376,7 +4406,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation type="unfinished"/>
</message>
@@ -4386,22 +4416,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ไม่มีผลลัพธ์สำหรับ &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>ฉันแชร์บางอย่างกับคุณ</translation>
</message>
@@ -4409,7 +4439,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
@@ -4419,62 +4449,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>สามารถแก้ไข</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4501,13 +4531,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>ฉันแชร์บางอย่างกับคุณ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
@@ -4517,79 +4547,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>คัดลอกลิงค์ส่วนตัวไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>ลบ</translation>
</message>
@@ -5164,29 +5215,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>เพิ่มบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>ตั้งค่า</translation>
</message>
@@ -5196,22 +5247,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5219,24 +5270,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5244,22 +5295,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5267,7 +5318,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
@@ -5300,22 +5351,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5977,7 +6028,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6086,7 +6137,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6107,7 +6158,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6131,7 +6182,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6169,7 +6220,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6179,18 +6230,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>เข้าสู่ระบบ</translation>
@@ -6204,52 +6255,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6335,12 +6386,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6348,98 +6399,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>เพิ่มบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>ตั้งค่า</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>เชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>ยกเลิกการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6460,7 +6506,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>เปิด %1 ในเบราว์เซอร์</translation>
</message>
@@ -6471,7 +6522,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6481,7 +6532,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6507,7 +6558,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 791d58f94..2f93a1908 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>%1 ögesini yerel olarak aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>%1 içinde</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>Yok say</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>Paylaşma penceresini aç</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Uçtan uca şifreleme anımsatıcısı</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Şifreli kimliğiniz korunmak için 12 sözlük sözcüğünden oluşan bir anımsatıcı ile şifrelendi. Lütfen bu sözcükleri not ederek güvenli bir yerde saklayın. Bu bilgi hesabınıza başka aygıtlar (cep telefonu ya da bilgisayar) eklemek istediğinizde gerekir.</translation>
</message>
@@ -734,47 +752,47 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Oturum kapatıldı</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>Bağlantı kuruldu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Hizmet kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Bakım kipi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Ağ sorunu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Yapılandırma sorunu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Kimlik doğrulama bilgileri soruluyor</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Hesap durumu bilinmiyor</translation>
</message>
@@ -782,17 +800,17 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Diğer işlemler için lütfen İşlemler uygulamasını açın.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation>İşlemler alınıyor...</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>Yok sayma listesindeki dosyalar ve sembolik bağlantılar eşitlenmez.</translation>
</message>
@@ -853,42 +871,42 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>İlerlerseniz &lt;b&gt;bu ayarlar silinecek&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>İlerlerseniz &lt;b&gt;bu ayarlar yok sayılacak&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Bazı ayarlar, bu uygulamanın daha yeni sürümleri üzerinden yapılmış ve bu sürümde kullanılamaz.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Geçerli yapılandırma dosyası zaten&lt;i&gt;%2&lt;/i&gt; üzerine yedeklendi.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Çık</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Sürdür</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Yapılandırma dosyasına erişilirken sorun çıktı</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>%1 üzerindeki yapılandırma dosyasına erişilirken bir sorun çıktı. Lütfen kullanıcı hesabınızın yapılandırma dosyasına erişme izinlerinin olduğundan emin olun.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>%1 uygulamasından çık</translation>
</message>
@@ -930,7 +948,6 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>%1 dosyasının değiştirilme zamanı geçersiz. Sunucuya yüklenmedi.</translation>
</message>
@@ -1203,8 +1220,8 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<translation>Sunucu dosya tarama yanıtında veri eksik.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Sunucu hatası: PROPFIND yanıtı XML biçiminde değil!</translation>
</message>
@@ -1960,12 +1977,12 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Klasör eşitleme bağlantısı ekle</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Eşitleme bağlantısı ekle</translation>
</message>
@@ -1983,7 +2000,7 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<translation>Yerel klasör yolunu yazın.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Kaynak klasörü seçin</translation>
</message>
@@ -1991,7 +2008,7 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Uzak klasör ekle</translation>
</message>
@@ -2001,47 +2018,47 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<translation>&apos;%1&apos; altına eklenecek yeni klasörün adını yazın:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>&quot;%1&quot; altına eklenecek yeni klasörün adını yazın:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Klasör %1 üzerine eklendi.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>%1 erişimi için kimlik doğrulanamadı</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>%1 üzerine klasör eklenemedi. Lütfen el ile denetleyin.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Bir klasör listelenemedi. Hata: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Tüm hesabı eşitlemek için bunu seçin</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Bu klasör zaten eşitleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%2&lt;/i&gt; klasörünün üst klasörü olan &lt;i&gt;%1&lt;/i&gt; zaten eşitleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%2&lt;/i&gt; klasörünün alt klasörü olan &lt;i&gt;%1&lt;/i&gt; zaten eşitleniyor.</translation>
</message>
@@ -2049,24 +2066,24 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>İçerik hemen indirilmek yerine sanal dosyalar kullanılsın %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(deneysel)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Sanal dosyalar, yerel klasör olarak Windows bölümü kök klasörlerini desteklemez. Lütfen sürücü harfinin altında bulunan bir klasör seçin.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Sanal dosyalar seçilmiş klasör için kullanılamaz</translation>
</message>
@@ -2087,27 +2104,27 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan herhangi bir E-Tag alınamadı, Vekil Sunucuyu/Ağ Geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek için farklı bir E-Tag alındı. Gelecek sefer yeniden denenecek.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>Beklenmeyen bir indirme içeriği uzunluğu alındı</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Sunucu yanlış bir içerik aralığı döndürdü</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Bağlantı zaman aşımı</translation>
</message>
@@ -2156,83 +2173,85 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<translation>Çağrı bildirimleri görüntülensin</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Güncellemeler</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Güncellemeleri otomatik olarak denetle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;Kanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>kararlı</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>beta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Yeniden başlat ve güncelle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Güncellemeri denetle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Gelişmiş</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Şu boyuttan büyük klasörlerin eşitlenmesi için onay istensin</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Dış depolama aygıtları ile eşitleme için onay istensin</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>&amp;Eşitleme klasörleri gezgin panosunda görüntülensin</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>Ç&amp;ökme bilgileri görüntülensin</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Yok sayılan &amp;dosyaları düzenle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>Hata ayıklama arşivi oluştur …</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>İlgilenmeniz gereken sunucu bildirimleri.</translation>
</message>
@@ -2242,17 +2261,17 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<translation>Çağrı bildirimi pencerelerini görüntüler.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>Otomatik başlatma sistem genelinde etkinleştirilmiş olduğundan, otomatik başlatma devre dışı bırakılamaz.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>Güncelleme kanalı değiştirilsin mi?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
Bu seçenek yalnız güncellemelerin hangi havuzdan alınacağını belirler. Güncelleme sonrası önceki sürüme geri dönülemeyeceğini unutmayın. Bu nedenle, genellikle beta kanalından kararlı kanala geri dönmek için kurulu olan beta sürümünden daha yeni bir kararlı sürümün yayınlanmasını beklemeniz gerekeceğinden bu işlem hemen gerçekleşmez.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>Güncelleme kanalını değiştir</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>Hata ayıklama arşivi oluştur</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip arşivleri</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>Hata ayıklama arşivi oluşturuldu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>%1 üzerinde hata ayıklama arşivi oluşturuldu</translation>
</message>
@@ -2647,7 +2666,7 @@ Günlükler %1 üzerine yazılacak</translation>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Hata</translation>
</message>
@@ -2657,7 +2676,7 @@ Günlükler %1 üzerine yazılacak</translation>
<translation>&lt;nobr&gt;&apos;%1&apos; dosyası&lt;br/&gt;yazılmak üzere açılamadı.&lt;br/&gt;&lt;br/&gt;Günlük çıktısı &lt;b&gt;kaydedilemez&lt;/b&gt;!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;&quot;%1&quot; dosyası&lt;br/&gt;yazılmak üzere açılamadı.&lt;br/&gt;&lt;br/&gt;Günlük çıktısı &lt;b&gt;kaydedilemez&lt;/b&gt;!&lt;/nobr&gt;</translation>
</message>
@@ -3546,12 +3565,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Dosya adı sunucu üzerinde kara listeye alınmış.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>Dosyanın uzantısı sanal dosyalar için ayrılmış.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>boyut</translation>
</message>
@@ -3566,22 +3585,22 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>sunucu numarası %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>izin</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>dosya kodu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>Sunucunun bildirilen numarası %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Değiştirilme zamanı geçersiz olduğundan eşitlenemedi</translation>
</message>
@@ -3591,47 +3610,47 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Bazı dosyalar bir klasöre yüklenirken çalışma oldu. Çakışmalar temizlenecek!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Bir klasör yüklenirken çakışma oldu. Çakışma temizlenecek!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Bir dosya yüklenirken çakışma oldu. Çakışma temizlenecek!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>&quot;Eşitlenecek ögeleri seçin&quot; kara listesinde olduğundan yok sayıldı</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Bu klasöre alt klasör ekleme izniniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Bu klasöre dosya ekleme izniniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucu üzerinde salt okunur olduğundan, bu dosya yüklenemedi, geri yükleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>Geçersiz bir hedefe taşındı, geri yükleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>Silmeye izin verilmedi, geri yükleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>Veritabanı okunurken sorun çıktı</translation>
</message>
@@ -3641,7 +3660,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>!%1&apos; klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>&quot;%1&quot; klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation>
</message>
@@ -3682,44 +3701,44 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>%1 dosyası, adının şifreleme bilgilerinin eksik olması nedeniyle indirilemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>%1 dosyası, adının şifreleme bilgilerinin eksik olması nedeniyle indirilemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Dosya taramadan sonra değiştirilmiş</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>%1 dosyası, adının yerel bir dosya ile çakışması nedeniyle indirilemedi!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>%1 dosyası, adının yerel bir dosya ile çakışması nedeniyle indirilemedi!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>İndirme sonucunda boş yerel disk alanı sınırın altına inebilir</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>Boş disk alanı %1 değerinin altında</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Dosya sunucudan silindi</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Dosya tam olarak indirilemedi.</translation>
</message>
@@ -3729,12 +3748,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Sunucu tarafından boyutu %1 olarak bildirilmesine rağmen indirilen dosya boş.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>İndirilen dosya boş. Ancak sunucu tarafından dosya boyutu %1 olarak bildirildi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 dosyası, adının yerel bir dosya ile çakışması nedeniyle kaydedilemedi!</translation>
</message>
@@ -3744,18 +3763,18 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Üst veri veritabanına yazılırken sorun çıktı</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Sunucu tarafından bildirilen %1 dosyasının değiştirilme tarihi geçersiz. Kaydedilmedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>Üst veriler güncellenirken sorun çıktı: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>%1 dosyası şu anda kullanılıyor</translation>
</message>
@@ -4142,7 +4161,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Yanıtla</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Yok say</translation>
</message>
@@ -4189,32 +4208,43 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>ownCloud Yolu:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Simge</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>paylaşma etiketi</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud Yolu:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>MetinEtiketi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Klasör: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 paylaşma</translation>
</message>
@@ -4224,17 +4254,17 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Dosya paylaşılamaz, çünkü sizinle herhangi bir paylaşım izni olmaksızın paylaşılmış.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>Dosya paylaşılamaz, çünkü sizinle herhangi bir paylaşım izni olmaksızın paylaşılmış.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Lütfen bağlantı paylaşımınız için bir parola yazın:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Paylaşım parolası zorunludur</translation>
</message>
@@ -4247,7 +4277,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Parola:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Paylaşım bağlantısı</translation>
</message>
@@ -4257,7 +4287,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Not:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>Not</translation>
</message>
@@ -4272,7 +4302,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Son kullanma tarihi:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Parola ayarla</translation>
</message>
@@ -4282,7 +4312,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Sona erme:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>Sona erme</translation>
</message>
@@ -4377,27 +4407,27 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Paylaşım bağlantısını sil</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Bağlantı paylaşımını silmeyi onayla</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Gerçekten &lt;i&gt;%1&lt;/i&gt; herkese açık bağlantısını silmek istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem geri alınamaz.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Sil</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Herkese açık bağlantı</translation>
</message>
@@ -4405,7 +4435,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Kullanıcılar ya da gruplarla paylaş …</translation>
</message>
@@ -4415,7 +4445,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Genel arama</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Bağlantıyı kopyala</translation>
</message>
@@ -4425,22 +4455,22 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>&apos;%1&apos; için bir sonuç bulunamadı</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>&quot;%1&quot; için bir sonuç bulunamadı</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>Paylaşım parolası zorunludur</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>Lütfen e-posta paylaşımınız için bir parola yazın:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Sizinle bir şey paylaştım</translation>
</message>
@@ -4448,7 +4478,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Kullanıcı adı</translation>
</message>
@@ -4458,62 +4488,62 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>düzenleyebilir</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>Düzenleyebilir</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>Not:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>Parola:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>Sona erme:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Yeniden paylaşabilsin</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>Alıcıya not</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>Son kullanma tarihini ayarla</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Paylaşımdan kaldır</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Ekleyebilsin</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Değiştirebilsin</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Silebilsin</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>Parola koruması</translation>
</message>
@@ -4540,13 +4570,13 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Yeni konum seçin …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Sizinle bir şey paylaştım</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Paylaşım seçenekleri</translation>
</message>
@@ -4556,79 +4586,100 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>%1 ile paylaş</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>İşlem</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Kişisel bağlantıyı panoya kopyala</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Kişisel bağlantıyı e-posta ile paylaş …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Bu dosya yeniden paylaşılamaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>Bu klasör yeniden paylaşılamaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Herkese açık bağlantıyı kopyala</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>İç bağlantıyı kopyala</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Düzenle</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>Çakışmayı çöz …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>Taşı ve yeniden adlandır …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>Taşı, yeniden adlandır ve yükle …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>Yerel değişiklikleri sil</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>Taşı ve yükle …</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Sil</translation>
</message>
@@ -5204,29 +5255,29 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Hesap ekle</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Ana pencereyi aç</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>Eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>Eşitlemeyi sürdür</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Ayarlar</translation>
</message>
@@ -5236,22 +5287,22 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Yardım</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>%1 uygulamasından çık</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>Tümü için eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>Tümü için eşitlemeyi sürdür</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5259,24 +5310,24 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 Masaüstü istemcisi&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;%1. sürüm. Ayrıntılı bilgi almak için &lt;a href=&apos;%2&apos;&gt;buraya tıklayabilirsiniz&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Sanal dosyalar eklentisi kullanılarak: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Bu sürüm %1 tarafından hazırlanmıştır&lt;/p&gt;</translation>
</message>
@@ -5284,22 +5335,22 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>Hizmet sağlayıcılar alınamadı.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>&apos;%1&apos; için hizmet sağlayıcılar alınamadı. Hata: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>&apos;%2&apos; için arama yapılamadı.</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>&apos;%1&apos; için arama yapılamadı. Hata: %2</translation>
</message>
@@ -5307,7 +5358,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Tüm yüklemeleri yinele</translation>
</message>
@@ -5340,22 +5391,22 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Hesap silmeyi onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Gerçekten &lt;i&gt;%1&lt;/i&gt; hesabının bağlantısını silmeyi istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem herhangi bir dosyayı &lt;b&gt;silmez&lt;/b&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Bağlantıyı sil</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
@@ -6017,7 +6068,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Yeni klasör</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>Okunmuş olarak işaretle</translation>
</message>
@@ -6126,7 +6177,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>Veritabanı bağlantısı kurulamadı.</translation>
</message>
@@ -6147,7 +6198,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>Dosya, ileti, etkinlik arayın …</translation>
</message>
@@ -6171,7 +6222,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>Diğer sonuçları yükle</translation>
</message>
@@ -6209,7 +6260,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Hesap bağlanmadı</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>Hesap işlemleri</translation>
</message>
@@ -6219,18 +6270,18 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Hesabı sil</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>Durumu ayarla</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Oturumu kapat</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Oturum aç</translation>
@@ -6244,52 +6295,52 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>Çevrimiçi durumu</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>Çevrimiçi</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>Uzakta</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>Rahatsız etmeyin</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>Görünmez</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>Durum iletisi</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>Durumunuz nedir?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>Durum iletisinin kaldırılma süresi</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>Durum iletisini kaldır</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>Durum iletisini ayarla</translation>
</message>
@@ -6375,12 +6426,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>İndirilen dosya sağlama değerine uygun değil, yeniden indirilecek. &apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>Sağlama üst bilgisinde bulunan &quot;%1&quot; sağlama türü bilinmiyor</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>İndirilen dosya sağlama değerine uygun değil, yeniden indirilecek. &quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6388,98 +6439,93 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud masaüstü ana penceresi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Geçerli hesap</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>Tümünü eşitlemeyi sürdür</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>Tümünü eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>Kullanıcı durumunu ayarla</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Hesap ekle</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>Hesap ekle</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Ayarlar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>Çık</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>Geçerli kullanıcı avatarı</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>Geçerli kullanıcı durumu çevrimiçi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>Geçerli kullanıcı durumu rahatsız etmeyin</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>Hesap değiştirici ve ayarlar menüsü</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>Geçerli hesabın yerel klasörünü aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>Bağlantı kuruldu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Web tarayıcıda Nextcloud Talk uygulamasını aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Diğer uygulamalar</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>Uygulamalar menüsü</translation>
@@ -6500,7 +6546,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Paylaşma penceresini aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Diğer uygulamalar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>%1 ögesini tarayıcıda aç</translation>
</message>
@@ -6511,7 +6562,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Daha fazla işlem görüntüle</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>Birleşik arama sonuçları listesi</translation>
</message>
@@ -6521,7 +6572,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>%1 ögesini paylaş</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - Dosya işlemi</translation>
</message>
@@ -6547,7 +6598,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;Git sürümü &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; ile %3 zamanında, %4 Qt %5 kullanılarak, %6 hazırlandı&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 13740cb41..6083cce07 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation type="unfinished"/>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation type="unfinished"/>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>Словникове шифрування end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Щоб захистити вашу криптографічну ідентичність, ми зашифруємо її мнемонікою з 12 словникових слів. Зверніть увагу на це та зберігайте їх у безпеці. Вони будуть потрібні для додавання інших пристроїв до вашого облікового запису (наприклад, мобільного телефону чи ноутбука).</translation>
</message>
@@ -730,47 +748,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>Вийшов</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>Від&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>З&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>Сервіс недоступний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>Режим обслуговування</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>Помилка мережі</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>Помилка конфігурації</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>Запит на повноваження доступу</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>Невідомий стан облікового запису</translation>
</message>
@@ -778,17 +796,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>Для докладного перегляду змін, будь ласка, відкрийте застосунок Події.</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation type="unfinished"/>
</message>
@@ -849,42 +867,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>Вихід</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>Продовжити</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>Помилка доступу до файлу конфігурації</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>Помилка з доступом до файлу налаштувань %1. Будь ласка, перевірте чи файл буде доступний для вашого користувача.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>Вийти %1</translation>
</message>
@@ -926,7 +944,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
@@ -1197,8 +1214,8 @@ This action will abort any currently running synchronization.</source>
<translation>Служба виявлення файлів на сервері повідомила про відсутні дані.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -1932,12 +1949,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>Додати з&apos;єднання для синхронізації теки </translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>Додайте з&apos;єднання для синхронізації</translation>
</message>
@@ -1955,7 +1972,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Введіть шлях до локальної теки.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>Оберіть початкову теку</translation>
</message>
@@ -1963,7 +1980,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>Створити Віддалену Теку</translation>
</message>
@@ -1973,47 +1990,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Введіть ім&apos;я нової теки, яка буде створена тут &apos;%1&apos;:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>Теку успішно створено на %1.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>Помилка аутентифікації при доступі до %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>Не вдалося створити теку на %1. Будь ласка, перевірте вручну.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>Неможливо вивести вміст теки. Помилка: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Оберіть це для синхронізації всього облікового запису</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>Тека вже синхронізується.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Тека &lt;i&gt;%1&lt;/i&gt; вже синхронізується, та вона є батьківською для &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -2021,24 +2038,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2059,27 +2076,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Не отримано E-Tag від серверу, перевірте мережеві налаштування (проксі, шлюз)</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ми отримали інший E-Tag для відновлення. Спробуйте ще раз пізніше.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>Сервер повернув невірний content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>Час з&apos;єднання вичерпано</translation>
</message>
@@ -2128,83 +2145,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>Оновлення</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>&amp;Автоматично перевіряти оновлення</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>&amp;Перезавантаження &amp;&amp; Оновлення</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>&amp;Перевірити оновлення зараз</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>Додатково</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>Підтверджувати синхронізацію тек, розмір яких більше</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>Підтверджувати перед синхронізацією зовнішніх тек</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>Показувати теки для синхронізації у панелі &amp;Файлового провідника</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>&amp;Вивести звіт про помилку</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>Редагувати &amp;ігноровані файли</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>Сповіщення сервера, на які треба звернути увагу.</translation>
</message>
@@ -2214,49 +2233,49 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
@@ -2610,7 +2629,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>Помилка</translation>
</message>
@@ -2620,7 +2639,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;Файл &apos;%1&apos;&lt;br/&gt;не вдається відкрити на запис.&lt;br/&gt;&lt;br/&gt;Журнал &lt;b&gt;не&lt;/b&gt; можливо зберегти!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"/>
</message>
@@ -3502,12 +3521,12 @@ 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/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation type="unfinished"/>
</message>
@@ -3522,22 +3541,22 @@ 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/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3547,47 +3566,47 @@ 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/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<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="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3597,7 +3616,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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3638,44 +3657,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Неможливо звантажити файл %1 через відсутність інформації про шифрування.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>Файл змінився з моменту знаходження</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Файл %1 не може бути завантажено через локальний конфлікт назви файлу! </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Це звантаження зменшить розмір вільного місця на локальному диску нижче встановленого обмеження.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>На диску залишилося менше %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>Файл вилучено з сервера</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>Файл не може бути завантажений повністю.</translation>
</message>
@@ -3685,12 +3704,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Звантажений файл є порожнім незважаючи на те, що сервер повідомив, що файл мав бути %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не збережено через локальний конфлікт назви файлу! </translation>
</message>
@@ -3700,18 +3719,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Помилка із записом метаданих до бази даних</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4098,7 +4117,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>Припинити</translation>
</message>
@@ -4145,32 +4164,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Шлях до ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>Значок</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>поділитися міткою</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Шлях до Nextcloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>Мітка</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>Тека: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>Ви поділилися %1</translation>
</message>
@@ -4180,17 +4210,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>Будь ласка, зазначте пароль на спільний ресурс:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>Потрібний пароль на спільний ресурс</translation>
</message>
@@ -4203,7 +4233,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Пароль:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>Спільний ресурс</translation>
</message>
@@ -4213,7 +4243,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Примітка:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation type="unfinished"/>
</message>
@@ -4228,7 +4258,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Дійсний до:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>Встановіть пароль</translation>
</message>
@@ -4238,7 +4268,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Термін дії до:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation type="unfinished"/>
</message>
@@ -4333,27 +4363,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Вилучити посилання для спільного використання</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>Підтвердіть вилучення спільного ресурсу з посиланням</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;Дійсно вилучити спільний ресурс із публічним посиланням &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Примітка: цю дію неможливо буде повернути.</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>Вилучити</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>Публічне посилання</translation>
</message>
@@ -4361,7 +4391,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>Поділитися з користувачами або групами...</translation>
</message>
@@ -4371,7 +4401,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/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>Скопіювати посилання</translation>
</message>
@@ -4381,22 +4411,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Відсутні результати для &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>Я поділився з вами документами</translation>
</message>
@@ -4404,7 +4434,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>Ім&apos;я користувача</translation>
</message>
@@ -4414,62 +4444,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>може редагувати</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>Може ділитися з іншими</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>Закрити спільний доступ</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>Може створювати</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>Може змінювати</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>Може вилучати</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation type="unfinished"/>
</message>
@@ -4496,13 +4526,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>Я чимось поділив(ла)ся з вами</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>Параметри спільного доступу</translation>
</message>
@@ -4512,79 +4542,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Поділитися за допомогою %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>Копіювати приватне посилання</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>Надіслати приватне посилання електронною поштою</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>Надання цього файлу у спільний доступ іншим не дозволено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>Копіювати публічне посилання</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>Копіювати внутрішнє посилання</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>Редагувати</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>Відкрити у бравзері</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>Вилучити</translation>
</message>
@@ -5160,29 +5211,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>Додати обліковий запис</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>Відкрити основне вікно діалогу</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>Налаштування</translation>
</message>
@@ -5192,22 +5243,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>Вийти %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -5215,24 +5266,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 клієнт для робочої істанції&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Цю збірку поставлено %1&lt;/p&gt;</translation>
</message>
@@ -5240,22 +5291,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation type="unfinished"/>
</message>
@@ -5263,7 +5314,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>Првторити усі завантаження</translation>
</message>
@@ -5296,22 +5347,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>Підтвердіть вилучення облікового запису</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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;Дійсно вилучити з&apos;єднання з обліковим записом &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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>Вилучити з&apos;єднання</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
@@ -5973,7 +6024,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/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation type="unfinished"/>
</message>
@@ -6082,7 +6133,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation type="unfinished"/>
</message>
@@ -6103,7 +6154,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation type="unfinished"/>
</message>
@@ -6127,7 +6178,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation type="unfinished"/>
</message>
@@ -6165,7 +6216,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/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation type="unfinished"/>
</message>
@@ -6175,18 +6226,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>Вихід</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>Увійти</translation>
@@ -6200,52 +6251,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation type="unfinished"/>
</message>
@@ -6331,12 +6382,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation type="unfinished"/>
</message>
@@ -6344,98 +6395,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>Поточний обліковий запис</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>Додати обліковий запис</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>Налаштування</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>З&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>Від&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>Більше застосунків</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation type="unfinished"/>
@@ -6456,7 +6502,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>Більше застосунків</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>Відкрити %1 в браузері</translation>
</message>
@@ -6467,7 +6518,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/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation type="unfinished"/>
</message>
@@ -6477,7 +6528,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/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation type="unfinished"/>
</message>
@@ -6503,7 +6554,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index dba4bf7df..f46031a8e 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>在本地打开 %1 </translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>在 %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>忽略</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>打开共享对话框</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>端到端加密助记词</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>为了保护您的加密身份,我们用 12 个助记词对其进行了加密。请将它们抄下来并妥善保管。在您向账号添加其他设备(手机或笔记本电脑)时需要用到。</translation>
</message>
@@ -730,47 +748,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>已退出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>已连接</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>服务不可用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>维护模式</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>网络错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>配置错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>凭证</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>未知的账号状态</translation>
</message>
@@ -778,17 +796,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>有关更多动态,请打开 “动态” 应用。</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>来自忽略列表的文件和符号链接不会被同步。</translation>
</message>
@@ -849,42 +867,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>继续意味着&lt;b&gt;删除这些设置&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>继续意味着&lt;b&gt;忽略这些设置&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>一些设置在此客户端的新版本中被配置,并使用了该版本中没有的功能。&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;当前配置文件已经备份到&lt;i&gt;%2&lt;/i&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>退出</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>访问配置文件时发生错误</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>访问配置文件 %1 时发生错误。请检查是否有访问权限。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>退出 %1</translation>
</message>
@@ -926,7 +944,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>文件 %1 修改时间无效。不要上传到服务器。</translation>
</message>
@@ -1199,8 +1216,8 @@ This action will abort any currently running synchronization.</source>
<translation>服务器文件发现的应答缺少数据。</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>服务器错误:PROPFIND 回复的格式不是 XML!</translation>
</message>
@@ -1951,12 +1968,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>添加同步文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>添加同步连接</translation>
</message>
@@ -1974,7 +1991,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>输入本地文件夹的路径。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>选择源文件夹</translation>
</message>
@@ -1982,7 +1999,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>创建远程文件夹</translation>
</message>
@@ -1992,47 +2009,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>输入 %1 中的新文件夹的名称:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>输入要在&quot;%1&quot;下方创建的新文件夹的名称</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>文件夹在 %1 上创建成功。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>访问 %1 时认证失败</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>无法在 %1 处创建文件夹。请自行检查。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>列表失败。错误:%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>选择此项以同步整个账号</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>文件夹已在同步中。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>您已经在同步 &lt;i&gt;%1&lt;/i&gt;,&lt;i&gt;%2&lt;/i&gt; 是它的一个子文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>你已经在同步 &lt;i&gt;%1&lt;/i&gt;,它是&lt;i&gt;%2&lt;/i&gt;的一个子文件夹。</translation>
</message>
@@ -2040,24 +2057,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>使用虚拟文件而非立即下载内容 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(实验性)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Windows分区根目录不支持虚拟文件作为本地文件夹。请在驱动器号下选择有效的子文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>虚拟文件对所选文件夹不可用</translation>
</message>
@@ -2078,27 +2095,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>未能收到来自服务器的 E-Tag,请检查代理/网关</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>我们收到了不同的恢复 E-Tag,将在下次尝试。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>我们收到一个意外的下载内容长度</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>服务器返回了错误的内容长度</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -2147,83 +2164,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>自动检查更新 (&amp;A)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>&amp;通道</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>稳定版</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>测试版</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>重启并更新(&amp;R)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>立即检查更新 (&amp;C)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>高级</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>请询问确认同步,若同步文件夹大于</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>请询问确认同步,若涉及外部存储</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>在文件管理器的导航显示同步文件夹(&amp;E)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>显示崩溃报告器(&amp;H)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>编辑忽略的文件(&amp;I)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>创建调试存档 ...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>需要注意的服务器通知。</translation>
</message>
@@ -2233,17 +2252,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>你不能禁用自启动,因为系统级的自启动处于启用状态。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>更改更新频道?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2252,32 +2271,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
请注意,这只会选择从何种中池升级,并且没有降级:因此,通常无法立即从测试版通道返回到稳定版通道,这意味着您需要等待比当前安装的测试版更新的稳定版。 </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>更改更新频道</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>创建调试存档</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>Zip 归档</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>调试存档已创建</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>调试存档已创建于 %1</translation>
</message>
@@ -2635,7 +2654,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>错误</translation>
</message>
@@ -2645,7 +2664,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;文件 &apos;%1&apos;&lt;br/&gt;不能写入。&lt;br/&gt;&lt;br/&gt;将&lt;b&gt;不&lt;/b&gt;能保存日志输出!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>无法打开&lt;nobr&gt;文件 &quot;%1&quot;&lt;br/&gt;进行写入。&lt;br/&gt;&lt;br/&gt;日志输出&lt;b&gt;无法&lt;/b&gt;被保存!&lt;/nobr&gt;</translation>
</message>
@@ -3528,12 +3547,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>该文件名在服务器上被列入黑名单</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>文件有为虚拟文件保留的扩展名</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>大小</translation>
</message>
@@ -3548,22 +3567,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>服务器报告无 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>权限</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>文件标识</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>服务器报告无 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
@@ -3573,47 +3592,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>上传文件到文件夹时发生冲突。那些冲突的会被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>上传文件夹时发生冲突。它会被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>上传时发生冲突。它将被移除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>因“选择要同步的内容”黑名单而被忽略</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>移动到无效目标,恢复中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>不允许移除,恢复中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>读取数据库时出错</translation>
</message>
@@ -3623,7 +3642,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>服务器在读取目录 &apos;%1&apos; 时回复了一个错误:%2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>服务器在读取目录 &quot;%1&quot; 时返回了一个错误: %2 </translation>
</message>
@@ -3664,44 +3683,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>由于加密信息丢失,文件 %1 无法下载。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>文件 %1 无法被下载,因为加密信息丢失。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>自从发现文件以来,它已经被修改了</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>文件 %1 无法被下载,因为一个本地文件名冲突!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>由于本地文件名冲突,文件 %1 无法下载。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>下载将减少低于限制的空闲本地磁盘空间</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>空闲磁盘空间少于 %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>已从服务器删除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>文件无法完整下载。</translation>
</message>
@@ -3711,12 +3730,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>虽然服务器宣称已完成 %1,但实际下载文件为空。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>已下载的文件为空,但是服务器说它应该是 %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>由于本地文件名冲突,文件 %1 无法保存。</translation>
</message>
@@ -3726,18 +3745,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>向数据库写入元数据错误</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>服务器报告文件 %1 的修改时间无效。不要保存它。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>更新元数据出错:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>文件 %1 在使用中</translation>
</message>
@@ -4124,7 +4143,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/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>忽略</translation>
</message>
@@ -4171,32 +4190,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud 路径:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>图标</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>共享标签</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud 路径:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>文本标签</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>文件夹:%2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 共享</translation>
</message>
@@ -4206,17 +4236,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>此文件无法被共享,因它没有共享权限</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>请输入您的共享链接密码:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>需要共享密码</translation>
</message>
@@ -4229,7 +4259,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>密码:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>共享链接</translation>
</message>
@@ -4239,7 +4269,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>备注:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>备注</translation>
</message>
@@ -4254,7 +4284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>有效期至:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>设置密码</translation>
</message>
@@ -4264,7 +4294,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>过期:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>到期</translation>
</message>
@@ -4359,27 +4389,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>删除共享链接</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>确认删除共享链接</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>您真的想删除公开共享链接 &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;p&gt;注意:此操作无法撤销。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>删除</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>公开链接</translation>
</message>
@@ -4387,7 +4417,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>与用户或分组共享...</translation>
</message>
@@ -4397,7 +4427,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>全局搜索</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>复制链接</translation>
</message>
@@ -4407,22 +4437,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>没有 &apos;%1&apos; 相关结果</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>没有 &quot;%1&quot;相关结果</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>需要共享密码 </translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>请为你的电邮共享输入一个密码:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>我向您共享了一些东西</translation>
</message>
@@ -4430,7 +4460,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>用户名</translation>
</message>
@@ -4440,62 +4470,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>可编辑</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>可以编辑</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>备注:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>密码:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>过期:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>允许重新共享</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>给收件人的备注</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>设置到期日</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>取消共享</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>可以创建</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>可以修改</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>可以删除</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>密码保护</translation>
</message>
@@ -4522,13 +4552,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>请选择新位置 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>我向您共享了一些东西</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>共享选项</translation>
</message>
@@ -4538,79 +4568,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>通过 %1 共享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>复制私人链接到剪贴板</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>通过电子邮件发送私人链接…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>不允许再次分享此文件</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>不允许重新分享这个文件夹</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>复制公开链接</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>复制内部链接</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>编辑</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>在浏览器中打开</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>解决冲突 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>移动并重命名 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>移动,重命名并上传 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>删除本地变更</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>移动并上传 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>删除</translation>
</message>
@@ -5186,29 +5237,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>添加账号</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>打开主对话框</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>恢复同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>设置</translation>
</message>
@@ -5218,22 +5269,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>退出 %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>全部暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>全部恢复同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1:%2</translation>
</message>
@@ -5241,24 +5292,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 桌面客户端&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;版本 %1。详情请点击&lt;a href=&apos;%2&apos;&gt;这里&lt;/a&gt;。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;正使用虚拟文件插件:%1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;该版本由 %1 提供&lt;/p&gt;</translation>
</message>
@@ -5266,22 +5317,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>获取提供商失败</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>未能获取 &apos;&apos;%1&apos; 的搜索提供商。错误: %2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>搜索 &apos;%2&apos; 失败</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>搜索“%1”失败。错误:%2</translation>
</message>
@@ -5289,7 +5340,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>重试所有上传</translation>
</message>
@@ -5322,22 +5373,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>确认移除账号</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>移除连接</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -5999,7 +6050,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>新文件夹</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>标记为已读</translation>
</message>
@@ -6108,7 +6159,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>未能连接至数据库</translation>
</message>
@@ -6129,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>搜索文件、消息、事件...</translation>
</message>
@@ -6153,7 +6204,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>加载更多结果</translation>
</message>
@@ -6191,7 +6242,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>账号未连接</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>账号操作</translation>
</message>
@@ -6201,18 +6252,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>移除账号</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>设置状态</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>登出</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>登录</translation>
@@ -6226,52 +6277,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>在线状态</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>在线</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>离开</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>勿扰</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>不可见</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>状态消息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>你什么状态?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>在指定时间段后清除状态消息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>清除状态消息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>设置状态消息</translation>
</message>
@@ -6357,12 +6408,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>下载的文件与校验和不匹配,它将被继续。&apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>校验和头包含未知的校验和类型 &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>已下载的文件和校验和不匹配,它将被继续下载。&quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6370,98 +6421,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud 桌面主对话框</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>当前账号</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>全部恢复同步</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>全部暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>设定用户状态</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>添加账号</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>添加新账号</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>设置</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>退出</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>当前用户头像</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>当前用户状态为“在线” </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>当前用户状态为“请勿打扰” </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>账号切换器和设置菜单</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>打开当前账号的本地文件夹</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>已连接</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>在浏览器中打开 Nextcloud Talk </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>更多的应用程序</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>应用菜单</translation>
@@ -6482,7 +6528,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>打开共享对话框</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>更多的应用程序</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
@@ -6493,7 +6544,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>显示更多操作</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>统一的搜索结果列表</translation>
</message>
@@ -6503,7 +6554,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>共享 %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - 文件动态</translation>
</message>
@@ -6529,7 +6580,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;使用Qt %5, %6,从 %3, %4 上的Git版本&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;构建&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts
index 515f2531a..5dcfc6ab4 100644
--- a/translations/client_zh_HK.ts
+++ b/translations/client_zh_HK.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>在近端打開 %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>在 %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>撤銷</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>開啟分享對話方塊</translation>
</message>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>端到端加密助記碼</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>為了保護您的身分,我們將用含12個單詞的助記碼進行加密。請將這些單詞記在一個安全的地方。要將其他裝置(如手提電話或手提電腦)加入您的賬戶中,需用到此助記碼。</translation>
</message>
@@ -735,47 +753,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>已經離線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>服務無法使用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>維護模式</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>網絡異常</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>設定錯誤</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>正在詢問憑證</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>未知的帳號狀態</translation>
</message>
@@ -783,17 +801,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>請開啟活動以檢視更多活動app</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation>正在擷取活動紀錄 ...</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>略過清單中的檔案以及符號連結不會同步。</translation>
</message>
@@ -854,42 +872,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>繼續將意味著&lt;b&gt;刪除這些設置&lt;/b&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>繼續將意味著&lt;b&gt;略過這些設置&lt;/b&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>某些設置是在此客戶端的較新版本中配置的,並使用了此版本中不可用的功能。&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; 當前配置檔案已備份到 &lt;i&gt;%2&lt;/i&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>結束</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>繼續</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>存取配置文件時錯誤</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>存取設定檔%1時發生錯誤 請確定檔案可以被用戶存取</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>離開 %1</translation>
</message>
@@ -931,7 +949,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>檔案 %1 的修改時間無效。 請勿上傳到伺服器。</translation>
</message>
@@ -1204,8 +1221,8 @@ This action will abort any currently running synchronization.</source>
<translation>伺服器回報檔案遺失</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>伺服器錯誤:PROPFIND回覆未採用XML格式!</translation>
</message>
@@ -1959,12 +1976,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>新增資料夾同步功能的連線</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>新增同步連線</translation>
</message>
@@ -1982,7 +1999,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>請輸入近端資料夾的路徑</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>選擇來源資料夾</translation>
</message>
@@ -1990,7 +2007,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>建立遠端資料夾</translation>
</message>
@@ -2000,47 +2017,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>請輸入欲創建在 &apos;%1&apos; 底下的新資料夾名稱:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>請輸入欲創建在 &quot;%1&quot; 底下的新資料夾名稱:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>資料夾成功建立在%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>存取 %1 認證失敗 </translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>在 %1 建立資料夾失敗,請手動檢查</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>取得資料夾清單失敗,錯誤: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation> 請選擇這個功能用來同步整個帳號</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>這個資料夾已經被同步了。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>您已經同步了 &lt;i&gt;%1&lt;/i&gt;, 這個資料夾是 &lt;i&gt;%2&lt;/i&gt; 的母資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>您已經同步了 &lt;i&gt;%1&lt;/i&gt;, 這個資料夾是 &lt;i&gt;%2&lt;/i&gt; 的子資料夾。</translation>
</message>
@@ -2048,24 +2065,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>使用虛擬檔案,而不是立即下載內容 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(實驗性)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Windows分區根目錄不支持將虛擬文件作為近端資料夾使用。請在硬盤驅動器號下選擇一個有效的子資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>選擇的資料夾無法使用虛擬檔案</translation>
</message>
@@ -2086,27 +2103,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>沒有收到來自伺服器的 E-Tag,請檢查代理伺服器或網路閘道</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>在復原時收到了不同的 E-Tag,將在下一次重新嘗試取得</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>我們收到了意外的下載內容長度。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>伺服器回應錯誤的內容長度</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>連線逾時</translation>
</message>
@@ -2155,83 +2172,85 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>顯示通話通告</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>自動檢查更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>頻道(&amp;C)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>穩定版</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>測試版</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>重新啟動並更新(&amp;R)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>立即檢查更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>進階</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>先詢問,當要同步的資料夾大小超過</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>在與外部儲存空間同步時先詢問</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>在檔案管理員中顯示資料夾</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>&amp;顯示意外舉報器</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>編輯要&amp;不用理會的檔案</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>建立除錯壓縮檔...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>伺服器公告,請注意</translation>
</message>
@@ -2241,17 +2260,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>顯示通話通告對話框。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>您不可以停用自動啟動,因為已啟用系統廣域自動啟動。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>變更更新頻道?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2260,32 +2279,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
請注意,這僅選擇從哪個池升級中進行升級,並且沒有降級:因此通常無法立即從Beta通道返回到穩定通道,這意味著要等待比當前安裝的測試版本更新的穩定版本。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>變更更新頻道</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>建立除錯壓縮檔</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>ZIP 壓縮檔</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>已建立除錯壓縮檔</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>除錯壓縮檔已建立於在 %1</translation>
</message>
@@ -2646,7 +2665,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
@@ -2656,7 +2675,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;檔案 &apos;%1&apos;&lt;br/&gt;無法開啟與寫入&lt;br/&gt;&lt;br/&gt;記錄 &lt;b&gt;無法&lt;/b&gt; 被儲存&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;檔案 &quot;%1&quot; &lt;br/&gt;無法開啟供寫入。&lt;br/&gt;&lt;br/&gt;記錄&lt;b&gt;無法&lt;/b&gt;保存!&lt;/nobr&gt;</translation>
</message>
@@ -3545,12 +3564,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>伺服器已將此檔名列為黑名單。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>檔案名包含為虛擬檔案保留的擴展名。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>大小</translation>
</message>
@@ -3565,22 +3584,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>伺服器報告沒有 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>權限</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>檔案 ID</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>伺服器報告沒有 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>由於修改時間無效,無法同步</translation>
</message>
@@ -3590,47 +3609,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>將某些檔案上傳到資料夾時發生衝突。那些有衝突的檔案將被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>上傳資料夾時發生衝突。將被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>上傳檔案時發生衝突。將被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>被忽略,因為它在“選擇要同步的內容”黑名單中</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>已移至無效目標,正在還原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除,還原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>讀取數據庫時發生錯誤。</translation>
</message>
@@ -3640,7 +3659,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>伺服器讀取目錄 &apos;%1&apos; 時發生錯誤:%2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>伺服器在讀取目錄「%1」回覆錯誤:%2</translation>
</message>
@@ -3681,44 +3700,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1檔案因缺乏加密資訊而未能下載。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>%1檔案因缺乏加密資訊而未能下載。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>尋找的過程中檔案已經被更改</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>檔案 %1 無法被下載,因為近端端的檔案名稱已毀損!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>檔案 %1 無法被下載,因為近端端的檔案名稱已毀損!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>此項下載將會使剩餘的近端儲存空間降到低於限值</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>可用的硬碟空間已經少於 %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>檔案已從伺服器被刪除</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>檔案下載無法完成。</translation>
</message>
@@ -3728,12 +3747,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>已下載的檔案為空,儘管伺服器所宣佈的檔案大小為%1。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>已下載的檔案為空,儘管伺服器說檔案大小為%1。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>檔案 %1 無法存檔,因為近端端的檔案名稱已毀損!</translation>
</message>
@@ -3743,18 +3762,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>寫入後設資料(metadata)時發生錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>伺服器報告檔案 %1 的修改時間無效。 不要保存它。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>更新元數據時出錯:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>檔案 %1 正在使用中</translation>
</message>
@@ -4141,7 +4160,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>回覆</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>撤銷</translation>
</message>
@@ -4188,32 +4207,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud 路徑:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>圖示</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>分享標籤</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud 路徑:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>資料夾: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 分享</translation>
</message>
@@ -4223,17 +4253,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>該檔案沒有分享權限,因此無法分享。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>請輸入分享連結密碼:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>透過密碼保護分享連結</translation>
</message>
@@ -4246,7 +4276,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>密碼:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>分享連結</translation>
</message>
@@ -4256,7 +4286,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>備註:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>筆記</translation>
</message>
@@ -4271,7 +4301,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>有效期至:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>設定密碼</translation>
</message>
@@ -4281,7 +4311,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>到期日:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>到期日:</translation>
</message>
@@ -4376,27 +4406,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>刪除分享連結</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>確認移除連結分享</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;您確定要移除公共連結分享&lt;i&gt;%1&lt;/i&gt;嗎?&lt;/p&gt;&lt;p&gt;注意:此操作不可復原。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>刪除</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>公共連結</translation>
</message>
@@ -4404,7 +4434,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>分享給適用者或群組</translation>
</message>
@@ -4414,7 +4444,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>全域搜尋</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>複製連結</translation>
</message>
@@ -4424,22 +4454,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>&apos;%1&apos; 沒有結果</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>&quot;%1&quot; 沒有結果</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>透過密碼保護分享連結</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>請輸入分享電郵地址密碼:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>我與你分享了檔案</translation>
</message>
@@ -4447,7 +4477,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>以用戶名稱分享</translation>
</message>
@@ -4457,62 +4487,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>可編輯</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>可編輯</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>備註:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>密碼:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>到期日:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>可以二次分享</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>給接收者的訊息</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>設定屆滿日期</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>取消分享</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>可以新增</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>可以更改</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>可以移除</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>密碼防護</translation>
</message>
@@ -4539,13 +4569,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>選擇新位址...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>我與你分享了檔案</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>分享選項</translation>
</message>
@@ -4555,79 +4585,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>由 %1 分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>活動紀錄</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>將私用連結複製至剪貼板</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>用電子郵件發送私人連結</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>此檔案不允許二次分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>不允許重新分享此資料夾</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>複製公共連結</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>複製內部連結</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>編輯</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>用瀏覽器打開</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>解決抵觸 ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>移動並重新命名...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>移動、重新命名並上傳...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>刪除近端變更</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>移動並上傳...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>刪除</translation>
</message>
@@ -5203,29 +5254,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>新增賬戶</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>開啟主對話方塊</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>暫停同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>繼續同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>設定</translation>
</message>
@@ -5235,22 +5286,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/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>離開 %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>暫停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>恢復所有同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1:%2</translation>
</message>
@@ -5258,24 +5309,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 桌面版用戶端&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;版本為%1。詳細資訊請&lt;a href=&apos;%2&apos;&gt;點擊此處&lt;/a&gt;。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;使用虛擬文件插件:%1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>此版本由%1發佈。</translation>
</message>
@@ -5283,22 +5334,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>無法擷取提供者。</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>無法擷取 “%1” 的搜尋提供者。 錯誤:%2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>搜尋 “%2” 失敗。 </translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>搜尋 “%1” 失敗。 錯誤:%2</translation>
</message>
@@ -5306,7 +5357,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>重試所有上傳</translation>
</message>
@@ -5339,22 +5390,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>請確認移除賬戶</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>移除連線</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -6016,7 +6067,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>新資料夾</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>標為已讀</translation>
</message>
@@ -6125,7 +6176,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>連接數據庫失敗。</translation>
</message>
@@ -6146,7 +6197,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>搜索檔案、訊息、活動 ...</translation>
</message>
@@ -6170,7 +6221,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>載入更多結果</translation>
</message>
@@ -6208,7 +6259,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>未連接到賬戶</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>賬戶操作</translation>
</message>
@@ -6218,18 +6269,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>設置狀態</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>登出</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>登入</translation>
@@ -6243,52 +6294,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>線上狀態</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>在線</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>離開</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>請勿打擾</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>隱藏</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>狀態訊息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>您目前的狀態是什麼呢?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>繼此之後清除狀態訊息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>清除狀態訊息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>設定狀態訊息</translation>
</message>
@@ -6374,12 +6425,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>下載的檔案與校驗和不匹配,將會被還原。&apos;%1&apos; != &apos;%2&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>檢查碼含有未知的型態 &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>下載的檔案與校驗和不匹配,將會被還原。&quot;%1&quot; != &quot;%2&quot;</translation>
</message>
@@ -6387,98 +6438,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud 桌面版主對話框 </translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>目前賬戶</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>恢復所有同步</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>暫停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>設置用戶狀態</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>新增賬戶</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>新增帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>離開</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>當前用戶頭像</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>目前用戶狀態為在線</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>目前用戶狀態為請勿打擾</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>帳戶切換器和設置選項單</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>打開當前賬戶的近端資料夾</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>已經離線</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>瀏覽器中開啟 Nextclould Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>更多應用程式</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>應用程式選單</translation>
@@ -6499,7 +6545,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>開啟分享對話方塊</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>更多應用程式</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>瀏覽器中開啟 %1</translation>
</message>
@@ -6510,7 +6561,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>顯示更多操作</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>統一搜索結果列表</translation>
</message>
@@ -6520,7 +6571,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>分享 %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - 檔案活動紀錄</translation>
</message>
@@ -6546,7 +6597,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;根據Git版本號&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;在 %3, %4建置 使用了Qt %5,%6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index 006790e8d..ca1b46072 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -2,12 +2,12 @@
<context>
<name>ActivityItem</name>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="40"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
<source>Open %1 locally</source>
<translation>在本機開啟 %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="46"/>
<source>In %1</source>
<translation>在 %1</translation>
</message>
@@ -45,13 +45,13 @@
<context>
<name>ActivityItemContent</name>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="207"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/>
<source>Dismiss</source>
<translation>忽略</translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityItemContent.qml" line="238"/>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/>
<source>Open share dialog</source>
<translation>開啟分享對話方塊</translation>
</message>
@@ -69,22 +69,22 @@
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="147"/>
<source>Talk notification caller avatar</source>
- <translation type="unfinished"/>
+ <translation>Talk 通知來電者大頭照</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="213"/>
<source>Answer Talk call notification</source>
- <translation type="unfinished"/>
+ <translation>接聽 Talk 來電通知</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="221"/>
<source>Decline</source>
- <translation type="unfinished"/>
+ <translation>回絕</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="237"/>
<source>Decline Talk call notification</source>
- <translation type="unfinished"/>
+ <translation>回絕 Talk 來電通知</translation>
</message>
</context>
<context>
@@ -327,14 +327,32 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="873"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="875"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="877"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="404"/>
+ <location filename="../src/gui/accountmanager.cpp" line="406"/>
<source>End to end encryption mnemonic</source>
<translation>端到端加密助記碼</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="405"/>
+ <location filename="../src/gui/accountmanager.cpp" line="407"/>
<source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>為了保護您的身份,我們將用含 12 個單詞的助記碼進行加密。請將這些單詞記在一個安全的地方。要將其他裝置(如手機或筆記型電腦)加入您的帳號中,需用到此助記碼。</translation>
</message>
@@ -734,47 +752,47 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Disconnected</source>
<translation>已斷線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="152"/>
<source>Service unavailable</source>
<translation>服務無法使用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="154"/>
<source>Maintenance mode</source>
<translation>維護模式</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="156"/>
<source>Network error</source>
<translation>網路錯誤</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="145"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Configuration error</source>
<translation>設定錯誤</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="147"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Asking Credentials</source>
<translation>正在詢問憑證</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="149"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Unknown account state</source>
<translation>未知的帳號狀態</translation>
</message>
@@ -782,17 +800,17 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/>
<source>For more activities please open the Activity app.</source>
<translation>請開啟活動應用程式以檢視更多活動。</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="474"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
- <translation type="unfinished"/>
+ <translation>正在擷取活動紀錄……</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
<translation>忽略列表中的檔案與符號連結不會同步。</translation>
</message>
@@ -853,42 +871,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="132"/>
+ <location filename="../src/gui/application.cpp" line="147"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation>繼續代表了&lt;b&gt;刪除這些設定&lt;/b&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="149"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation>繼續代表了&lt;b&gt;忽略這些設定&lt;/b&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="140"/>
+ <location filename="../src/gui/application.cpp" line="155"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>部份設定是在此客戶端的較新版本中設定的,且使用了此版本不提供的功能。&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;目前的設定檔已備份至 &lt;i&gt;%2&lt;/i&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="147"/>
+ <location filename="../src/gui/application.cpp" line="162"/>
<source>Quit</source>
<translation>離開</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="148"/>
+ <location filename="../src/gui/application.cpp" line="163"/>
<source>Continue</source>
<translation>繼續</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="316"/>
+ <location filename="../src/gui/application.cpp" line="334"/>
<source>Error accessing the configuration file</source>
<translation>存取設定檔時發生錯誤</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="317"/>
+ <location filename="../src/gui/application.cpp" line="335"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
<translation>存取位於 %1 的設定檔時發生錯誤。請確保您的使用者可以存取該檔案。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="320"/>
+ <location filename="../src/gui/application.cpp" line="338"/>
<source>Quit %1</source>
<translation>離開 %1</translation>
</message>
@@ -930,7 +948,6 @@ This action will abort any currently running synchronization.</source>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
- <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>檔案 %1 的修改時間無效。不要上傳到伺服器。</translation>
</message>
@@ -1203,8 +1220,8 @@ This action will abort any currently running synchronization.</source>
<translation>伺服器回報檔案遺失。</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="519"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="544"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="567"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="592"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>伺服器錯誤:PROPFIND 回覆未使用 XML 格式!</translation>
</message>
@@ -1960,12 +1977,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="623"/>
+ <location filename="../src/gui/folderwizard.cpp" line="650"/>
<source>Add Folder Sync Connection</source>
<translation>新增資料夾同步功能的連線</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="625"/>
+ <location filename="../src/gui/folderwizard.cpp" line="652"/>
<source>Add Sync Connection</source>
<translation>新增同步連線</translation>
</message>
@@ -1983,7 +2000,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>請輸入本機資料夾的路徑。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>選擇來源資料夾</translation>
</message>
@@ -1991,7 +2008,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="210"/>
<source>Create Remote Folder</source>
<translation>建立遠端資料夾</translation>
</message>
@@ -2001,47 +2018,47 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>請輸入要在「%1」底下建立的資料夾名稱:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="211"/>
<source>Enter the name of the new folder to be created below &quot;%1&quot;:</source>
<translation>請輸入要在「%1」底下建立的資料夾名稱:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="213"/>
+ <location filename="../src/gui/folderwizard.cpp" line="240"/>
<source>Folder was successfully created on %1.</source>
<translation>資料夾成功建立於 %1。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="223"/>
+ <location filename="../src/gui/folderwizard.cpp" line="250"/>
<source>Authentication failed accessing %1</source>
<translation>存取 %1 驗證失敗</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="252"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>在 %1 建立資料夾失敗。請手動檢查。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="243"/>
+ <location filename="../src/gui/folderwizard.cpp" line="270"/>
<source>Failed to list a folder. Error: %1</source>
<translation>取得資料夾列表失敗。錯誤:%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="324"/>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation> 請選擇這個功能用來同步整個帳號</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="467"/>
+ <location filename="../src/gui/folderwizard.cpp" line="494"/>
<source>This folder is already being synced.</source>
<translation>這個資料夾已經被同步了。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="469"/>
+ <location filename="../src/gui/folderwizard.cpp" line="496"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>您已經同步了 &lt;i&gt;%1&lt;/i&gt;,這個資料夾是 &lt;i&gt;%2&lt;/i&gt; 的上層資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="471"/>
+ <location filename="../src/gui/folderwizard.cpp" line="498"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>您已經同步了 &lt;i&gt;%1&lt;/i&gt;,這個資料夾是 &lt;i&gt;%2&lt;/i&gt; 的下層資料夾。</translation>
</message>
@@ -2049,24 +2066,24 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Use virtual files instead of downloading content immediately %1</source>
<translation>使用虛擬檔案而非立刻下載內容 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="510"/>
- <location filename="../src/gui/folderwizard.cpp" line="547"/>
+ <location filename="../src/gui/folderwizard.cpp" line="537"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>(experimental)</source>
<translation>(實驗性)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="543"/>
+ <location filename="../src/gui/folderwizard.cpp" line="570"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation>Windows 分割區跟目錄不支援將虛擬檔案作為本機資料夾使用。請在磁碟區代號下選擇有效的子資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="566"/>
+ <location filename="../src/gui/folderwizard.cpp" line="593"/>
<source>Virtual files are not available for the selected folder</source>
<translation>選取的資料夾無法使用虛擬檔案</translation>
</message>
@@ -2087,27 +2104,27 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="196"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="195"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>沒有收到來自伺服器的 E-Tag,請檢查代理伺服器或網路閘道器</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="203"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="202"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>在復原時收到了不同的 E-Tag。將在下一次重新嘗試取得。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="214"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="213"/>
<source>We received an unexpected download Content-Length.</source>
<translation>我們收到了非預期的下載 Content-Length。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="242"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="241"/>
<source>Server returned wrong content-range</source>
<translation>伺服器回傳了錯誤的內容長度</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="368"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
<source>Connection Timeout</source>
<translation>連線逾時</translation>
</message>
@@ -2153,106 +2170,108 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message>
<location filename="../src/gui/generalsettings.ui" line="96"/>
<source>Show Call Notifications</source>
- <translation type="unfinished"/>
+ <translation>顯示來電通知</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
+ <location filename="../src/gui/generalsettings.ui" line="106"/>
<source>Updates</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="107"/>
+ <location filename="../src/gui/generalsettings.ui" line="114"/>
<source>&amp;Automatically check for Updates</source>
<translation>自動檢查更新(&amp;A)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <location filename="../src/gui/generalsettings.ui" line="134"/>
<source>&amp;Channel</source>
<translation>頻道(&amp;C)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="151"/>
+ <location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>stable</source>
<translation>穩定版</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="149"/>
+ <location filename="../src/gui/generalsettings.ui" line="156"/>
+ <location filename="../src/gui/generalsettings.cpp" line="322"/>
<source>beta</source>
<translation>測試版</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="176"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>重新啟動並更新(&amp;R)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="191"/>
+ <location filename="../src/gui/generalsettings.ui" line="198"/>
<source>&amp;Check for Update now</source>
<translation>立即檢查更新(&amp;C)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="214"/>
+ <location filename="../src/gui/generalsettings.ui" line="221"/>
<source>Advanced</source>
<translation>進階</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <location filename="../src/gui/generalsettings.ui" line="229"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>先詢問,當要同步的資料夾大小超過</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="242"/>
+ <location filename="../src/gui/generalsettings.ui" line="249"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="266"/>
+ <location filename="../src/gui/generalsettings.ui" line="273"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>在與外部儲存空間同步時先詢問</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="277"/>
+ <location filename="../src/gui/generalsettings.ui" line="284"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation>在檔案總管的導覽面板中顯示同步資料夾(&amp;E)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="294"/>
+ <location filename="../src/gui/generalsettings.ui" line="301"/>
<source>S&amp;how crash reporter</source>
<translation>顯示當機回報程式(&amp;H)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="305"/>
+ <location filename="../src/gui/generalsettings.ui" line="312"/>
<source>Edit &amp;Ignored Files</source>
<translation>編輯被忽略的檔案(&amp;I)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="312"/>
+ <location filename="../src/gui/generalsettings.ui" line="319"/>
<source>Create Debug Archive …</source>
<translation>建立除錯壓縮檔……</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="149"/>
+ <location filename="../src/gui/generalsettings.cpp" line="147"/>
<source>Server notifications that require attention.</source>
<translation>需要注意的伺服器通知。</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="151"/>
<source>Show call notification dialogs.</source>
- <translation type="unfinished"/>
+ <translation>顯示來電通知對話方塊。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="163"/>
+ <location filename="../src/gui/generalsettings.cpp" line="165"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation>您無法停用自動啟動,因為已啟用系統層面的自動啟動。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="316"/>
+ <location filename="../src/gui/generalsettings.cpp" line="354"/>
<source>Change update channel?</source>
<translation>變更更新頻道?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="317"/>
+ <location filename="../src/gui/generalsettings.cpp" line="355"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
@@ -2261,32 +2280,32 @@ Note that this selects only what pool upgrades are taken from, and that there ar
請注意,這只是選取從哪個軟體庫中取得升級,無法降級,因此通常無法立刻從測試頻道回到穩定頻道,這代表了要等到比目前測試版本還新的穩定版本才會切換成功。</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="330"/>
+ <location filename="../src/gui/generalsettings.cpp" line="368"/>
<source>Change update channel</source>
<translation>變更更新頻道</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="331"/>
+ <location filename="../src/gui/generalsettings.cpp" line="369"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Create Debug Archive</source>
<translation>建立除錯壓縮檔</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="424"/>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
<source>Zip Archives</source>
<translation>ZIP 壓縮檔</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug Archive Created</source>
<translation>已建立除錯壓縮檔</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="430"/>
+ <location filename="../src/gui/generalsettings.cpp" line="479"/>
<source>Debug archive is created at %1</source>
<translation>除錯壓縮檔已在 %1 建立</translation>
</message>
@@ -2647,7 +2666,7 @@ Logs will be written to %1</source>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="150"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
@@ -2657,7 +2676,7 @@ Logs will be written to %1</source>
<translation>&lt;nobr&gt;檔案「%1」&lt;br/&gt;無法開啟與寫入。&lt;br/&gt;&lt;br/&gt;紀錄&lt;b&gt;無法&lt;/b&gt;被儲存!&lt;/nobr&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="151"/>
+ <location filename="../src/libsync/logger.cpp" line="175"/>
<source>&lt;nobr&gt;File &quot;%1&quot;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output &lt;b&gt;cannot&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;檔案「%1」&lt;br/&gt;無法開啟供寫入。&lt;br/&gt;&lt;br/&gt;記錄&lt;b&gt;無法&lt;/b&gt;被儲存!&lt;/nobr&gt;</translation>
</message>
@@ -3546,12 +3565,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>伺服器已將此檔名列為黑名單。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="416"/>
+ <location filename="../src/libsync/discovery.cpp" line="419"/>
<source>File has extension reserved for virtual files.</source>
<translation>檔案有為虛擬檔案保留的副檔名。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="491"/>
+ <location filename="../src/libsync/discovery.cpp" line="502"/>
<source>size</source>
<translation>大小</translation>
</message>
@@ -3566,22 +3585,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>伺服器回報沒有 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="493"/>
+ <location filename="../src/libsync/discovery.cpp" line="504"/>
<source>permission</source>
<translation>權限</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="497"/>
+ <location filename="../src/libsync/discovery.cpp" line="508"/>
<source>file id</source>
<translation>檔案 ID</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="501"/>
+ <location filename="../src/libsync/discovery.cpp" line="512"/>
<source>Server reported no %1</source>
<translation>伺服器回報沒有 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="846"/>
+ <location filename="../src/libsync/discovery.cpp" line="857"/>
<source>Cannot sync due to invalid modification time</source>
<translation>由於修改時間無效,因此無法同步</translation>
</message>
@@ -3591,47 +3610,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>將某些檔案上傳到資料夾時發生錯誤。衝突的檔案將會被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1140"/>
+ <location filename="../src/libsync/discovery.cpp" line="1151"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>上傳資料夾時發生衝突。將會被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1143"/>
+ <location filename="../src/libsync/discovery.cpp" line="1154"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>上傳檔案時發生衝突。其將會被移除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1477"/>
+ <location filename="../src/libsync/discovery.cpp" line="1488"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>由於「選擇要同步的內容」黑名單而被忽略</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1510"/>
+ <location filename="../src/libsync/discovery.cpp" line="1521"/>
<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="1515"/>
+ <location filename="../src/libsync/discovery.cpp" line="1526"/>
<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="1528"/>
+ <location filename="../src/libsync/discovery.cpp" line="1539"/>
<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="1550"/>
+ <location filename="../src/libsync/discovery.cpp" line="1561"/>
<source>Moved to invalid target, restoring</source>
<translation>移動至無效目標,正在復原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1564"/>
+ <location filename="../src/libsync/discovery.cpp" line="1575"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除,正在復原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1702"/>
+ <location filename="../src/libsync/discovery.cpp" line="1713"/>
<source>Error while reading the database</source>
<translation>讀取資料庫時發生錯誤</translation>
</message>
@@ -3641,7 +3660,7 @@ 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/discovery.cpp" line="1763"/>
+ <location filename="../src/libsync/discovery.cpp" line="1774"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>伺服器在讀取目錄「%1」回覆錯誤:%2</translation>
</message>
@@ -3682,44 +3701,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 檔案因為缺少加密資訊而無法下載。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
<source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation>%1 檔案因為缺少加密資訊而無法下載。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1148"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1192"/>
<source>File has changed since discovery</source>
<translation>尋找的過程中檔案已經被更改</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="522"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="627"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="521"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="626"/>
<source>File %1 cannot be downloaded because of a local file name clash!</source>
<translation>檔案 %1 無法被下載,因為本機檔案名稱有衝突!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="529"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="528"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>檔案 %1 無法被下載,因為本機檔案名稱有衝突!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="679"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="678"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>下載將會減少剩餘的本機磁碟空間,使其低於限制</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="683"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
<source>Free space on disk is less than %1</source>
<translation>可用的磁碟空間已經少於 %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="804"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="803"/>
<source>File was deleted from server</source>
<translation>檔案已從伺服器刪除</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="877"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="876"/>
<source>The file could not be downloaded completely.</source>
<translation>檔案下載無法完成。</translation>
</message>
@@ -3729,12 +3748,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>儘管伺服器宣告其應為 %1,但下載的檔案為空。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="884"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="883"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation>已下載的檔案為空,但伺服器表示其應為 %1。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1075"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1119"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>檔案 %1 無法儲存,因為本機檔案名稱有衝突!</translation>
</message>
@@ -3744,18 +3763,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>將詮釋資料寫入到資料庫時發生錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1125"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1138"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>伺服器回報檔案 %1 的修改時間無效。不要儲存。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source>
<translation>更新詮釋資料時發生錯誤:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1222"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1272"/>
<source>The file %1 is currently in use</source>
<translation>檔案 %1 目前正在使用中</translation>
</message>
@@ -4142,7 +4161,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>回覆</translation>
</message>
<message>
- <location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
<source>Dismiss</source>
<translation>我已了解</translation>
</message>
@@ -4189,32 +4208,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ownCloud 路徑:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
+ <location filename="../src/gui/sharedialog.ui" line="75"/>
<source>Icon</source>
<translation>圖示</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
+ <location filename="../src/gui/sharedialog.ui" line="94"/>
<source>share label</source>
<translation>分享標籤</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
+ <location filename="../src/gui/sharedialog.ui" line="125"/>
<source>Nextcloud Path:</source>
<translation>Nextcloud 路徑:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="92"/>
+ <location filename="../src/gui/sharedialog.ui" line="150"/>
+ <source>TextLabel</source>
+ <translation>文字標籤</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharedialog.cpp" line="95"/>
<source>%1</source>
<translation>%1</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <source>Locked by %1 - Expire in %2 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="124"/>
<source>Folder: %2</source>
<translation>資料夾:%2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="127"/>
<source>%1 Sharing</source>
<translation>%1 分享</translation>
</message>
@@ -4224,17 +4254,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/sharedialog.cpp" line="287"/>
+ <location filename="../src/gui/sharedialog.cpp" line="312"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation>此檔案沒有分享權限,因此無法被分享。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="372"/>
+ <location filename="../src/gui/sharedialog.cpp" line="393"/>
<source>Please enter a password for your link share:</source>
<translation>請輸入分享連結密碼:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="373"/>
+ <location filename="../src/gui/sharedialog.cpp" line="394"/>
<source>Password for share required</source>
<translation>透過密碼保護分享連結</translation>
</message>
@@ -4247,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>密碼:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="59"/>
<source>Share link</source>
<translation>分享連結</translation>
</message>
@@ -4257,7 +4287,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>備註:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="146"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="167"/>
<source>Note</source>
<translation>筆記</translation>
</message>
@@ -4272,7 +4302,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>到期日:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="223"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="244"/>
<source>Set password</source>
<translation>設定密碼</translation>
</message>
@@ -4282,7 +4312,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>到期日:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="294"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="315"/>
<source>Expires</source>
<translation>到期日</translation>
</message>
@@ -4377,27 +4407,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>刪除分享連結</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
<source>Confirm Link Share Deletion</source>
<translation>確認移除連結分享</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="534"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
<translation>&lt;p&gt;您確定要移除公開連結分享 &lt;i&gt;%1&lt;/i&gt; 嗎?&lt;/p&gt;&lt;p&gt;注意:此動作無法復原。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="540"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
<source>Delete</source>
<translation>刪除</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="541"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="511"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="559"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="529"/>
<source>Public link</source>
<translation>公開連結</translation>
</message>
@@ -4405,7 +4435,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
+ <location filename="../src/gui/shareusergroupwidget.ui" line="74"/>
<source>Share with users or groups …</source>
<translation>與使用者或群組分享……</translation>
</message>
@@ -4415,7 +4445,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>全域搜尋</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="353"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="321"/>
<source>Copy link</source>
<translation>複製連結</translation>
</message>
@@ -4425,22 +4455,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>「%1」沒有結果</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="333"/>
<source>No results for &quot;%1&quot;</source>
<translation>「%1」沒有結果</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
<source>Password for share required</source>
<translation>透過密碼保護分享連結</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="411"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
<source>Please enter a password for your email share:</source>
<translation>請輸入您電子郵件分享的密碼:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="464"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="421"/>
<source>I shared something with you</source>
<translation>我與您分享了一些東西</translation>
</message>
@@ -4448,7 +4478,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="62"/>
+ <location filename="../src/gui/shareuserline.ui" line="80"/>
<source>Username</source>
<translation>使用者名稱</translation>
</message>
@@ -4458,62 +4488,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>可編輯</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="97"/>
+ <location filename="../src/gui/shareuserline.ui" line="115"/>
<source>Can edit</source>
<translation>可編輯</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="131"/>
+ <location filename="../src/gui/shareuserline.ui" line="149"/>
<source>Note:</source>
<translation>備註:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="187"/>
+ <location filename="../src/gui/shareuserline.ui" line="205"/>
<source>Password:</source>
<translation>密碼:</translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="259"/>
+ <location filename="../src/gui/shareuserline.ui" line="277"/>
<source>Expires:</source>
<translation>到期:</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="485"/>
<source>Can reshare</source>
<translation>可以二次分享</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="539"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="496"/>
<source>Note to recipient</source>
<translation>給收件人的說明</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="555"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="512"/>
<source>Set expiration date</source>
<translation>設定到期日</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="570"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="527"/>
<source>Unshare</source>
<translation>取消分享</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="579"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="536"/>
<source>Can create</source>
<translation>可以新增</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="585"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/>
<source>Can change</source>
<translation>可以更改</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="591"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="548"/>
<source>Can delete</source>
<translation>可以刪除</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="600"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="557"/>
<source>Password protect</source>
<translation>密碼保護</translation>
</message>
@@ -4540,13 +4570,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>選取新位置……</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="980"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1006"/>
<source>I shared something with you</source>
<translation>我與您分享了一些東西</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="993"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1025"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1019"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/>
<source>Share options</source>
<translation>分享選項</translation>
</message>
@@ -4556,79 +4586,100 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>透過 %1 分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1020"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1197"/>
<source>Activity</source>
<translation>事件</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="996"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1022"/>
<source>Copy private link to clipboard</source>
<translation>將私人連結複製到剪貼簿</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="997"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
<source>Send private link by email …</source>
<translation>用電子郵件發送私人連結……</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this file is not allowed</source>
<translation>此檔案不允許二次分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1023"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1049"/>
<source>Resharing this folder is not allowed</source>
<translation>此資料夾不允許二次分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1037"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1063"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1065"/>
<source>Copy public link</source>
<translation>複製公開連結</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1043"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1069"/>
<source>Copy internal link</source>
<translation>複製內部連結</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1143"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
+ <source>Lock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
+ <source>Unlock file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
+ <source>Locked by %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
+ <source>Expire in %1 minutes</source>
+ <comment>remaining time before lock expire</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1203"/>
<source>Edit</source>
<translation>編輯</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1145"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1205"/>
<source>Open in browser</source>
<translation>用瀏覽器打開</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1168"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1229"/>
<source>Resolve conflict …</source>
<translation>解決衝突……</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1172"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1233"/>
<source>Move and rename …</source>
<translation>移動並重新命名……</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1175"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1236"/>
<source>Move, rename and upload …</source>
<translation>移動、重新命名並上傳……</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1177"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1238"/>
<source>Delete local changes</source>
<translation>刪除本機變更</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1183"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1244"/>
<source>Move and upload …</source>
<translation>移動並上傳……</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1245"/>
<source>Delete</source>
<translation>刪除</translation>
</message>
@@ -5204,29 +5255,29 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="103"/>
+ <location filename="../src/gui/systray.cpp" line="105"/>
<source>Add account</source>
<translation>新增帳號</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="105"/>
+ <location filename="../src/gui/systray.cpp" line="107"/>
<source>Open main dialog</source>
<translation>開啟主對話框</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="108"/>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync</source>
<translation>暫停同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="109"/>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync</source>
<translation>繼續同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="110"/>
+ <location filename="../src/gui/systray.cpp" line="112"/>
<source>Settings</source>
<translation>設定</translation>
</message>
@@ -5236,22 +5287,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/systray.cpp" line="111"/>
+ <location filename="../src/gui/systray.cpp" line="114"/>
<source>Exit %1</source>
<translation>離開 %1</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="118"/>
+ <location filename="../src/gui/systray.cpp" line="121"/>
<source>Pause sync for all</source>
<translation>暫停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="124"/>
+ <location filename="../src/gui/systray.cpp" line="127"/>
<source>Resume sync for all</source>
<translation>恢復所有同步</translation>
</message>
<message>
- <location filename="../src/gui/systray.cpp" line="260"/>
+ <location filename="../src/gui/systray.cpp" line="301"/>
<source>%1: %2</source>
<translation>%1:%2</translation>
</message>
@@ -5259,24 +5310,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="517"/>
+ <location filename="../src/libsync/theme.cpp" line="520"/>
<source>&lt;p&gt;%1 Desktop Client&lt;/p&gt;</source>
<extracomment>Example text: &quot;&lt;p&gt;Nextcloud Desktop Client&lt;/p&gt;&quot; (%1 is the application name)</extracomment>
<translation>&lt;p&gt;%1 桌面版客戶端&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="520"/>
- <location filename="../src/libsync/theme.cpp" line="535"/>
+ <location filename="../src/libsync/theme.cpp" line="523"/>
+ <location filename="../src/libsync/theme.cpp" line="538"/>
<source>&lt;p&gt;Version %1. For more information please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;版本為 %1。詳細資訊請點擊&lt;a href=&apos;%2&apos;&gt;此處&lt;/a&gt;。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="524"/>
+ <location filename="../src/libsync/theme.cpp" line="527"/>
<source>&lt;p&gt;&lt;small&gt;Using virtual files plugin: %1&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;正在使用虛擬檔案外掛程式:%1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="539"/>
+ <location filename="../src/libsync/theme.cpp" line="542"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;此版本由 %1 提供&lt;/p&gt;</translation>
</message>
@@ -5284,22 +5335,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="374"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="386"/>
<source>Failed to fetch providers.</source>
<translation>擷取提供者失敗。</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="385"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="397"/>
<source>Failed to fetch search providers for &apos;%1&apos;. Error: %2</source>
<translation>擷取「%1」的搜尋提供者失敗。錯誤:%2</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="431"/>
<source>Search has failed for &apos;%2&apos;.</source>
<translation>搜尋「%2」失敗。</translation>
</message>
<message>
- <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="460"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
<translation>搜尋「%1」失敗。錯誤:%2</translation>
</message>
@@ -5307,7 +5358,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="440"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="471"/>
<source>Retry all uploads</source>
<translation>重試所有上傳</translation>
</message>
@@ -5340,22 +5391,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="915"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1009"/>
<source>Confirm Account Removal</source>
<translation>請確認移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="916"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1010"/>
<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/tray/usermodel.cpp" line="921"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1015"/>
<source>Remove connection</source>
<translation>移除連線</translation>
</message>
<message>
- <location filename="../src/gui/tray/usermodel.cpp" line="922"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1016"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -6017,7 +6068,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>新資料夾</translation>
</message>
<message>
- <location filename="../src/gui/tray/activitylistmodel.cpp" line="790"/>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/>
<source>Mark as read</source>
<translation>標記為已讀</translation>
</message>
@@ -6126,7 +6177,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncJournalDb</name>
<message>
- <location filename="../src/common/syncjournaldb.cpp" line="976"/>
+ <location filename="../src/common/syncjournaldb.cpp" line="895"/>
<source>Failed to connect database.</source>
<translation>連結資料庫失敗。</translation>
</message>
@@ -6147,7 +6198,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchInputContainer</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="27"/>
<source>Search files, messages, events …</source>
<translation>搜尋檔案、訊息、事件……</translation>
</message>
@@ -6171,7 +6222,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UnifiedSearchResultListItem</name>
<message>
- <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="39"/>
<source>Load more results</source>
<translation>載入更多結果</translation>
</message>
@@ -6209,7 +6260,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>未連線帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="154"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="152"/>
<source>Account actions</source>
<translation>帳號動作</translation>
</message>
@@ -6219,18 +6270,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="185"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="183"/>
<source>Set status</source>
<translation>設定狀態</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log out</source>
<translation>登出</translation>
</message>
<message>
- <location filename="../src/gui/tray/UserLine.qml" line="205"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="204"/>
<location filename="../src/gui/tray/UserLine.qml" line="224"/>
<source>Log in</source>
<translation>登入</translation>
@@ -6244,52 +6295,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>UserStatusSelector</name>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="38"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="34"/>
<source>Online status</source>
<translation>線上狀態</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="55"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="51"/>
<source>Online</source>
<translation>線上</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="65"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Away</source>
<translation>離開</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="76"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
<source>Do not disturb</source>
<translation>請勿打擾</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="86"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="82"/>
<source>Invisible</source>
<translation>隱藏</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="99"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="95"/>
<source>Status message</source>
<translation>狀態訊息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="137"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="133"/>
<source>What is your status?</source>
<translation>您目前的狀態是什麼呢?</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="165"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="161"/>
<source>Clear status message after</source>
<translation>在這個時間後清除狀態訊息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="182"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="178"/>
<source>Clear status message</source>
<translation>清除狀態訊息</translation>
</message>
<message>
- <location filename="../src/gui/UserStatusSelector.qml" line="188"/>
+ <location filename="../src/gui/UserStatusSelector.qml" line="184"/>
<source>Set status message</source>
<translation>設定狀態訊息</translation>
</message>
@@ -6375,12 +6426,12 @@ 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/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="380"/>
<source>The checksum header contained an unknown checksum type &quot;%1&quot;</source>
<translation>檢查碼標頭包含了未知的檢查碼類型「%1」</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="371"/>
+ <location filename="../src/common/checksums.cpp" line="385"/>
<source>The downloaded file does not match the checksum, it will be resumed. &quot;%1&quot; != &quot;%2&quot;</source>
<translation>已下載的檔案與檢查碼不相符,其將會被還原。「%1」!=「%2」</translation>
</message>
@@ -6388,98 +6439,93 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>Window</name>
<message>
- <location filename="../src/gui/tray/Window.qml" line="116"/>
+ <location filename="../src/gui/tray/Window.qml" line="137"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud 桌面版主要對話框</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="142"/>
+ <location filename="../src/gui/tray/Window.qml" line="164"/>
<source>Current account</source>
<translation>目前帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Resume sync for all</source>
<translation>恢復所有同步</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="148"/>
- <location filename="../src/gui/tray/Window.qml" line="268"/>
+ <location filename="../src/gui/tray/Window.qml" line="170"/>
+ <location filename="../src/gui/tray/Window.qml" line="310"/>
<source>Pause sync for all</source>
<translation>暫停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="190"/>
+ <location filename="../src/gui/tray/Window.qml" line="230"/>
<source>Set user status</source>
<translation>設定使用者狀態</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="227"/>
+ <location filename="../src/gui/tray/Window.qml" line="268"/>
<source>Add account</source>
<translation>新增帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="240"/>
+ <location filename="../src/gui/tray/Window.qml" line="281"/>
<source>Add new account</source>
<translation>新增帳號</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="274"/>
+ <location filename="../src/gui/tray/Window.qml" line="316"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="296"/>
+ <location filename="../src/gui/tray/Window.qml" line="339"/>
<source>Exit</source>
<translation>離開</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="340"/>
+ <location filename="../src/gui/tray/Window.qml" line="384"/>
<source>Current user avatar</source>
<translation>目前使用者的大頭照</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is online</source>
<translation>目前的使用者狀態為在線上</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="379"/>
+ <location filename="../src/gui/tray/Window.qml" line="423"/>
<source>Current user status is do not disturb</source>
<translation>目前的使用者狀態為請勿打擾</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="444"/>
+ <location filename="../src/gui/tray/Window.qml" line="489"/>
<source>Account switcher and settings menu</source>
<translation>帳號切換器與設定選單</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="499"/>
+ <location filename="../src/gui/tray/Window.qml" line="508"/>
<source>Open local folder of current account</source>
<translation>開啟目前帳號的本機資料夾</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="493"/>
+ <location filename="../src/gui/tray/Window.qml" line="531"/>
<source>Disconnected</source>
<translation>已斷線</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="510"/>
+ <location filename="../src/gui/tray/Window.qml" line="567"/>
<source>Open Nextcloud Talk in browser</source>
<translation>在瀏覽器中開啟 Nextcloud Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="529"/>
- <source>More apps</source>
- <translation>更多應用程式</translation>
- </message>
- <message>
<location filename="../src/gui/tray/Window.qml" line="549"/>
<source>Apps menu</source>
<translation>應用程式選單</translation>
@@ -6500,7 +6546,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>開啟分享對話框</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="557"/>
+ <location filename="../src/gui/tray/Window.qml" line="587"/>
+ <source>More apps</source>
+ <translation>更多應用程式</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/Window.qml" line="628"/>
<source>Open %1 in browser</source>
<translation>在瀏覽器中開啟 %1</translation>
</message>
@@ -6511,7 +6562,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>顯示更多動作</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="681"/>
+ <location filename="../src/gui/tray/Window.qml" line="752"/>
<source>Unified search results list</source>
<translation>統一搜尋結果清單</translation>
</message>
@@ -6521,7 +6572,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>分享 %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="753"/>
+ <location filename="../src/gui/tray/Window.qml" line="824"/>
<source>%1 - File activity</source>
<translation>%1 - 檔案事件</translation>
</message>
@@ -6547,7 +6598,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="496"/>
+ <location filename="../src/libsync/theme.cpp" line="499"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;從 Git 修訂版本 &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; 在 %3 上建置,%4 使用 Qt %5,%6&lt;/small&gt;&lt;/p&gt;</translation>
</message>